From 1eff217426d72ee694498a5c785bbf9540f828f8 Mon Sep 17 00:00:00 2001
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Sun, 30 May 2004 08:54:27 +0000
Subject: [PATCH] The file pt_tcplisten.c lacks the $FreeBSD$ keyword.  Use the
 opportunity to change all files to __FBSDID.

Approved by:	das (mentor)
---
 usr.sbin/mount_portalfs/activate.c       | 6 ++----
 usr.sbin/mount_portalfs/conf.c           | 6 ++----
 usr.sbin/mount_portalfs/mount_portalfs.c | 7 +++----
 usr.sbin/mount_portalfs/pt_conf.c        | 6 ++----
 usr.sbin/mount_portalfs/pt_exec.c        | 6 ++----
 usr.sbin/mount_portalfs/pt_file.c        | 6 ++----
 usr.sbin/mount_portalfs/pt_tcp.c         | 6 ++----
 usr.sbin/mount_portalfs/pt_tcplisten.c   | 3 +++
 8 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index 6143620b365d..2e8b13ced89b 100644
--- a/usr.sbin/mount_portalfs/activate.c
+++ b/usr.sbin/mount_portalfs/activate.c
@@ -37,10 +37,8 @@
  *	@(#)activate.c	8.3 (Berkeley) 4/28/95
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <string.h>
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index d5833e4b2136..f3a65e67022d 100644
--- a/usr.sbin/mount_portalfs/conf.c
+++ b/usr.sbin/mount_portalfs/conf.c
@@ -37,10 +37,8 @@
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index baad22fffa8a..5ed2145c333a 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -40,13 +40,12 @@ char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
 #if 0
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index f158a73dd03d..1f8bbc355f5e 100644
--- a/usr.sbin/mount_portalfs/pt_conf.c
+++ b/usr.sbin/mount_portalfs/pt_conf.c
@@ -37,10 +37,8 @@
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/mount_portalfs/pt_exec.c b/usr.sbin/mount_portalfs/pt_exec.c
index 359c78e92164..c5a4f5617654 100644
--- a/usr.sbin/mount_portalfs/pt_exec.c
+++ b/usr.sbin/mount_portalfs/pt_exec.c
@@ -37,10 +37,8 @@
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/usr.sbin/mount_portalfs/pt_file.c b/usr.sbin/mount_portalfs/pt_file.c
index f22ebd7d2b51..2aed8d07c424 100644
--- a/usr.sbin/mount_portalfs/pt_file.c
+++ b/usr.sbin/mount_portalfs/pt_file.c
@@ -37,10 +37,8 @@
  *	@(#)pt_file.c	8.3 (Berkeley) 7/3/94
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index 49056163aae3..d84b0a03939e 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -37,10 +37,8 @@
  *	@(#)pt_tcp.c	8.5 (Berkeley) 4/28/95
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcplisten.c b/usr.sbin/mount_portalfs/pt_tcplisten.c
index 43a20c5aa92c..db86622bf16a 100644
--- a/usr.sbin/mount_portalfs/pt_tcplisten.c
+++ b/usr.sbin/mount_portalfs/pt_tcplisten.c
@@ -41,6 +41,9 @@
  * pt_tcp.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>