From 02547822f3959c89da057ca3285975533e391ac9 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sat, 30 Dec 2017 00:26:42 +0000
Subject: [PATCH] ccdconfig: Move VCS tags to be more consistent with our
 style.

Update a now-bogus SPDX tag while here.
---
 sbin/ccdconfig/ccdconfig.8 | 3 +--
 sbin/ccdconfig/ccdconfig.c | 6 +++---
 sbin/ccdconfig/pathnames.h | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index c31f4cfd501f..778a7f921c70 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -1,5 +1,3 @@
-.\"	$NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
-.\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
@@ -27,6 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
 .\" $FreeBSD$
 .\"
 .Dd October 3, 2016
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 3a336a4d5e42..6d22b14deed8 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,7 +1,5 @@
-/*	$NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $	*/
-
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,6 +28,8 @@
  * 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.
+ *
+ * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 0b67c6dc800f..85791ddbfcff 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -1,5 +1,3 @@
-/*	$NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $	*/
-
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-NetBSD
  *
@@ -30,6 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
+ * $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $
  * $FreeBSD$
  */