18 files changed, 37 insertions, 12 deletions

diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index ed6a7c71e090..25c13b7f6c09 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 66b7c9009833..7493fc5b1bbc 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
index c346a8bba283..8dfc215178d0 100644
--- a/lib/libedit/el.c
+++ b/lib/libedit/el.c
@@ -34,12 +34,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint && not SCCSID */
 
 /*
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index d84c36022317..b83c0bb29971 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)emacs.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index 27dacd1925b1..da00a293699e 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index ac9c3a9969eb..6579412d51c0 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 24e56a821c82..027ebe7017ba 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -34,10 +34,10 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint && not SCCSID */
 
 /*
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index 4b940d40a8e1..bc436ccaf775 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index dd5bd942fe7c..9cfd818b4117 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 59ba200c7312..6baef8a53408 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index dcc9a83d35cd..959d91f1a993 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -34,12 +34,13 @@
  * SUCH DAMAGE.
  */
 
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint && not SCCSID */
 /*
  * read.c: Clean this junk up! This is horrible code.
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 6c3ee935644f..567491e153c2 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 0716ff2ac489..24f6697d3f3b 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
index 72b9645cccf0..cdbed51d844b 100644
--- a/lib/libedit/sig.c
+++ b/lib/libedit/sig.c
@@ -32,10 +32,10 @@
  * 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$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 65fd1a15669c..1b4dbb75d79c 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -32,10 +32,10 @@
  * 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$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 62c02498177f..1c4e50e6ca68 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index 80f4dab2c330..e0275d50dda4 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -32,10 +32,10 @@
  * 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$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 5099757d9354..db213c9859a5 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */