git: bfa1565246cf - stable/14 - Trim various $FreeBSD$

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Tue, 24 Oct 2023 18:37:12 UTC
The branch stable/14 has been updated by jhb:

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

commit bfa1565246cf02153749d2635814b03ad5d61d38
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-10-10 17:34:43 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-10-24 18:22:23 +0000

    Trim various $FreeBSD$
    
    Approved by:    markj (cddl/contrib changes)
    Reviewed by:    imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D41961
    
    (cherry picked from commit f53355131f65d64e7643d734dbcd4fb2a5de20ed)
---
 cddl/contrib/opensolaris/cmd/dtrace/dtrace.1     | 2 --
 cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 | 2 --
 cddl/usr.sbin/dwatch/dwatch                      | 1 -
 include/rpc/rpcb_prot.x                          | 2 --
 lib/ofed/libirdma/Makefile                       | 2 --
 share/man/man4/pcf8591.4                         | 2 --
 share/vt/keymaps/colemak-dh.acc.kbd              | 2 --
 stand/kboot/arch/powerpc64/ldscript.powerpc      | 2 --
 sys/dev/firmware/xilinx/zynqmp_firmware_if.m     | 2 --
 sys/modules/ath12k/Makefile                      | 2 --
 sys/modules/mt76/mt7996/Makefile                 | 2 --
 tools/tools/editing/freebsd.vim                  | 2 --
 tools/tools/locale/etc/charmaps.xml              | 1 -
 usr.sbin/ypldap/ypldap.c                         | 1 -
 14 files changed, 25 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
index 42367b99b786..1745519c2c1a 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
@@ -18,8 +18,6 @@
 .\" CDDL HEADER END
 .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd February 24, 2023
 .Dt DTRACE 1
 .Os
diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
index c649e21bb67e..6c9657fa5406 100644
--- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
+++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
@@ -19,8 +19,6 @@
 .\" CDDL HEADER END
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd February 25, 2020
 .Dt LOCKSTAT 1
 .Os
diff --git a/cddl/usr.sbin/dwatch/dwatch b/cddl/usr.sbin/dwatch/dwatch
index 9adde7eb8d49..c9af8258f4ac 100755
--- a/cddl/usr.sbin/dwatch/dwatch
+++ b/cddl/usr.sbin/dwatch/dwatch
@@ -1327,7 +1327,6 @@ PSARGS_ACTION=$( cat <&9 )
  * SUCH DAMAGE.
  *
  * $TITLE dtrace(1) script to log process(es) triggering $PROBE $
- * \$FreeBSD$
  */
 
 $( echo "$DTRACE_PRAGMA" | awk '
diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x
index a34bcc12502a..b5de5c6d865d 100644
--- a/include/rpc/rpcb_prot.x
+++ b/include/rpc/rpcb_prot.x
@@ -1,6 +1,4 @@
 %/*-
-% * $FreeBSD$
-% *
 % * Copyright (c) 2009, Sun Microsystems, Inc.
 % * All rights reserved.
 % *
diff --git a/lib/ofed/libirdma/Makefile b/lib/ofed/libirdma/Makefile
index 368bd536c587..349590672b44 100644
--- a/lib/ofed/libirdma/Makefile
+++ b/lib/ofed/libirdma/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD: releng/12.1/lib/ofed/libirdma/Makefile 336568 2018-07-20 23:49:57Z kib $
-
 _spath=	${SRCTOP}/contrib/ofed/libirdma
 _ipath=	${SRCTOP}/contrib/ofed/include
 lin_inc=/usr/src/sys/compat/linuxkpi/common/include
diff --git a/share/man/man4/pcf8591.4 b/share/man/man4/pcf8591.4
index 6133d6cfa0d8..9acaf6502b38 100644
--- a/share/man/man4/pcf8591.4
+++ b/share/man/man4/pcf8591.4
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/cp2112.4 364144 2020-08-12 09:42:05Z avg $
-.\"
 .Dd November 6, 2021
 .Dt PCF8591 4
 .Os
diff --git a/share/vt/keymaps/colemak-dh.acc.kbd b/share/vt/keymaps/colemak-dh.acc.kbd
index 82c5faa2c6a6..b3f1b7d5ba83 100644
--- a/share/vt/keymaps/colemak-dh.acc.kbd
+++ b/share/vt/keymaps/colemak-dh.acc.kbd
@@ -1,5 +1,3 @@
-# $FreeBSD $
-#
 # Colemak Mod-DH (rev. 2) layout for FreeBSD console
 # 2006-01-01 Shai Coleman (http://colemak.com/),
 # 2014-10-27 Steve P (http://colemakmods.github.io/mod-dh/).
diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/arch/powerpc64/ldscript.powerpc
index 662871eb7c09..f9fcc37f02d8 100644
--- a/stand/kboot/arch/powerpc64/ldscript.powerpc
+++ b/stand/kboot/arch/powerpc64/ldscript.powerpc
@@ -1,5 +1,3 @@
-/* $FreeBSD: user/nwhitehorn/kboot/powerpc/kboot/ldscript.powerpc 272888 2014-10-10 06:24:09Z bapt $ */
-
 OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
 	      "elf32-powerpc-freebsd")
 OUTPUT_ARCH(powerpc:common)
diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m
index 1007d721952d..53b9fa5399bb 100644
--- a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m
+++ b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m
@@ -23,8 +23,6 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
-#
-# $FreeBSD$
 
 INTERFACE zynqmp_firmware;
 
diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile
index e72d061d0c08..674a68e12813 100644
--- a/sys/modules/ath12k/Makefile
+++ b/sys/modules/ath12k/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 DEVATH12KDIR=	${SRCTOP}/sys/contrib/dev/athk/ath12k
 
 .PATH: ${DEVATH12KDIR}
diff --git a/sys/modules/mt76/mt7996/Makefile b/sys/modules/mt76/mt7996/Makefile
index 3a4a56d839a5..a43721b6079e 100644
--- a/sys/modules/mt76/mt7996/Makefile
+++ b/sys/modules/mt76/mt7996/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 DEVDIR=	${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7996
 
 .PATH: ${DEVDIR}
diff --git a/tools/tools/editing/freebsd.vim b/tools/tools/editing/freebsd.vim
index fa7977b30361..e515f81890df 100644
--- a/tools/tools/editing/freebsd.vim
+++ b/tools/tools/editing/freebsd.vim
@@ -21,8 +21,6 @@
 " THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 " (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 " THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"
-" $FreeBSD$
 
 " This is a plugin for Vim (tested with Vim v7.1) to follow the FreeBSD style(9)
 " indentation.  It registers a macro (see below) for changing a buffer's
diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index dcf1644e4371..0193912b9a01 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -1,4 +1,3 @@
-<!-- $FreeBSD$ -->
 <data>
 <languages>
 	<!-- Attributes known:
diff --git a/usr.sbin/ypldap/ypldap.c b/usr.sbin/ypldap/ypldap.c
index 9a6dc303dd9d..ff1965dd6e2c 100644
--- a/usr.sbin/ypldap/ypldap.c
+++ b/usr.sbin/ypldap/ypldap.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: ypldap.c,v 1.16 2015/11/02 10:06:06 jmatthew Exp $ */
-/*	$FreeBSD */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>