From fa4144861a6583bf09d7274f521cb72df0604dcd Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Wed, 23 May 2018 17:02:12 +0000
Subject: [PATCH] Use __SCCSID() for SCCS IDs.

- Define NO__SCCSID in CFLAGS to preserve existing behavior of omitting
  SCCS IDs by default.
- While here, fix the $FreeBSD$ in pw_util.c to use __FBSDID.
---
 lib/libutil/Makefile    |  2 +-
 lib/libutil/login_tty.c |  7 +------
 lib/libutil/pty.c       |  7 +------
 lib/libutil/pw_util.c   | 10 +++-------
 lib/libutil/uucplock.c  |  5 +----
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 59685d577b82..68f57e4cff2e 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -19,7 +19,7 @@ SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
 	stub.c trimdomain.c uucplock.c
 INCS=	libutil.h login_cap.h
 
-CFLAGS+= -DLIBC_SCCS
+CFLAGS+= -DNO__SCCSID
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 00d7e6180b63..0fc6bfca2235 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -31,12 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)login_tty.c	8.1 (Berkeley) 6/4/93");
 
 #include <sys/param.h>
 
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 8faf91545380..8eb2c2965759 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -31,12 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)pty.c	8.3 (Berkeley) 5/16/94");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index d28741c60e9f..112b6d8af45a 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -36,13 +36,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+__SCCSID("@(#)pw_util.c	8.3 (Berkeley) 4/2/94");
 
 /*
  * This file is used by all the "password" programs; vipw(8), chpass(1),
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 18e233c63731..f76a23771cc6 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -31,10 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#ifndef lint
-static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
+__SCCSID("@(#)uucplock.c	8.1 (Berkeley) 6/6/93");
 
 #include <sys/types.h>
 #include <sys/file.h>