From nobody@FreeBSD.org  Wed Apr  7 18:00:03 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4460116A4D8
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  7 Apr 2004 18:00:03 -0700 (PDT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3C0C043D2F
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  7 Apr 2004 18:00:03 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.10/8.12.10) with ESMTP id i3810372092584
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 7 Apr 2004 18:00:03 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.10/8.12.10/Submit) id i38103Oh092583;
	Wed, 7 Apr 2004 18:00:03 -0700 (PDT)
	(envelope-from nobody)
Message-Id: <200404080100.i38103Oh092583@www.freebsd.org>
Date: Wed, 7 Apr 2004 18:00:03 -0700 (PDT)
From: Robert Millan <rmh@debian.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [1] Portability fixes for FreeBSD build utils
X-Send-Pr-Version: www-2.3

>Number:         65306
>Category:       bin
>Synopsis:       [patch] [build] Portability fixes for FreeBSD build utils, part 1/2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    obrien
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 07 18:00:35 PDT 2004
>Closed-Date:    Thu May 31 23:03:43 UTC 2012
>Last-Modified:  Thu May 31 23:03:43 UTC 2012
>Originator:     Robert Millan
>Release:        5.2.1+20040403
>Organization:
Debian
>Environment:
>Description:
This is the first one of a set of patches to fix portability in the
FreeBSD build utilities. The goal is that they run on any POSIX system
so that they can be used to bootstrap FreeBSD from non-FreeBSD systems.
(FYI, we're already using them in Debian for cross-platform operability. See http://packages.debian.org/freebsd-buildutils)

This patch protects the __unused and __FBSDID macros in each of the
relevant source files. Due to the existing __FBSDID lines being subject
to continous updates, this changes have great chances to get outdated,
so I'm sending them first. Please apply soon.

>How-To-Repeat:
      
>Fix:
I'll attach the patch as a followup once the PR is created.

>Release-Note:
>Audit-Trail:

From: Robert Millan <zeratul2@wanadoo.es>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: misc/65306: [1] Portability fixes for FreeBSD build utils
Date: Thu, 8 Apr 2004 02:03:32 +0200

 --dDRMvlgZJXvWKvBx
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 Patch attached.
 
 -- 
 Robert Millan
 
 "[..] but the delight and pride of Aule is in the deed of making, and in the
 thing made, and neither in possession nor in his own mastery; wherefore he
 gives and hoards not, and is free from care, passing ever on to some new work."
 
  -- J.R.R.T., Ainulindale (Silmarillion)
 
 --dDRMvlgZJXvWKvBx
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="portable.diff"
 
 diff -ur src.old/usr.bin/cksum/cksum.c src/usr.bin/cksum/cksum.c
 --- src.old/usr.bin/cksum/cksum.c	2003-03-14 00:32:28.000000000 +0100
 +++ src/usr.bin/cksum/cksum.c	2004-04-07 23:49:13.000000000 +0200
 @@ -47,7 +47,9 @@
  #endif /* not lint */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/cksum/cksum.c,v 1.17 2003/03/13 23:32:28 robert Exp $");
 +#endif
  
  #include <sys/types.h>
  
 diff -ur src.old/usr.bin/cksum/crc.c src/usr.bin/cksum/crc.c
 --- src.old/usr.bin/cksum/crc.c	2003-03-14 00:32:28.000000000 +0100
 +++ src/usr.bin/cksum/crc.c	2004-04-07 23:49:27.000000000 +0200
 @@ -40,7 +40,9 @@
  #endif
  #endif /* not lint */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/cksum/crc.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 +#endif
  
  #include <sys/types.h>
  
 diff -ur src.old/usr.bin/cksum/crc32.c src/usr.bin/cksum/crc32.c
 --- src.old/usr.bin/cksum/crc32.c	2003-03-14 00:32:28.000000000 +0100
 +++ src/usr.bin/cksum/crc32.c	2004-04-07 23:49:37.000000000 +0200
 @@ -12,7 +12,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/cksum/crc32.c,v 1.9 2003/03/13 23:32:28 robert Exp $");
 +#endif
  
  #include <sys/types.h>
  
 diff -ur src.old/usr.bin/cksum/print.c src/usr.bin/cksum/print.c
 --- src.old/usr.bin/cksum/print.c	2003-03-14 00:32:28.000000000 +0100
 +++ src/usr.bin/cksum/print.c	2004-04-07 23:49:46.000000000 +0200
 @@ -38,7 +38,9 @@
  #endif /* not lint */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/cksum/print.c,v 1.7 2003/03/13 23:32:28 robert Exp $");
 +#endif
  
  #include <sys/types.h>
  
 diff -ur src.old/usr.bin/cksum/sum1.c src/usr.bin/cksum/sum1.c
 --- src.old/usr.bin/cksum/sum1.c	2003-03-14 00:32:28.000000000 +0100
 +++ src/usr.bin/cksum/sum1.c	2004-04-07 23:50:05.000000000 +0200
 @@ -38,7 +38,9 @@
  #endif /* not lint */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/cksum/sum1.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 +#endif
  
  #include <sys/types.h>
  
 diff -ur src.old/usr.bin/cksum/sum2.c src/usr.bin/cksum/sum2.c
 --- src.old/usr.bin/cksum/sum2.c	2003-03-14 00:32:28.000000000 +0100
 +++ src/usr.bin/cksum/sum2.c	2004-04-07 23:50:19.000000000 +0200
 @@ -37,7 +37,9 @@
  #endif
  #endif /* not lint */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/cksum/sum2.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 +#endif
  
  #include <sys/types.h>
  
 diff -ur src.old/usr.bin/lex/ccl.c src/usr.bin/lex/ccl.c
 --- src.old/usr.bin/lex/ccl.c	2002-06-30 07:25:03.000000000 +0200
 +++ src/usr.bin/lex/ccl.c	2004-04-07 23:50:33.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/ccl.c,v 2.9 93/09/16 20:32:14 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/ccl.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/dfa.c src/usr.bin/lex/dfa.c
 --- src.old/usr.bin/lex/dfa.c	2002-06-30 07:25:03.000000000 +0200
 +++ src/usr.bin/lex/dfa.c	2004-04-07 23:50:54.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/dfa.c,v 2.26 95/04/20 13:53:14 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/dfa.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/ecs.c src/usr.bin/lex/ecs.c
 --- src.old/usr.bin/lex/ecs.c	2002-06-30 07:25:03.000000000 +0200
 +++ src/usr.bin/lex/ecs.c	2004-04-07 23:51:09.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/ecs.c,v 2.9 93/12/07 10:18:20 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/ecs.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/gen.c src/usr.bin/lex/gen.c
 --- src.old/usr.bin/lex/gen.c	2004-01-06 19:54:55.000000000 +0100
 +++ src/usr.bin/lex/gen.c	2004-04-07 23:51:21.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/gen.c,v 2.56 96/05/25 20:43:38 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/gen.c,v 1.7 2004/01/06 18:54:55 nectar Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/initscan.c src/usr.bin/lex/initscan.c
 --- src.old/usr.bin/lex/initscan.c	2002-08-25 15:22:44.000000000 +0200
 +++ src/usr.bin/lex/initscan.c	2004-04-07 23:51:32.000000000 +0200
 @@ -5,7 +5,9 @@
   * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
   */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/initscan.c,v 1.9 2002/08/25 13:22:44 charnier Exp $");
 +#endif
  
  #define FLEX_SCANNER
  #define YY_FLEX_MAJOR_VERSION 2
 diff -ur src.old/usr.bin/lex/main.c src/usr.bin/lex/main.c
 --- src.old/usr.bin/lex/main.c	2002-06-30 07:25:04.000000000 +0200
 +++ src/usr.bin/lex/main.c	2004-04-07 23:51:43.000000000 +0200
 @@ -34,7 +34,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/main.c,v 2.64 96/05/25 20:42:42 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/main.c,v 1.8 2002/06/30 05:25:04 obrien Exp $");
 +#endif
  
  
  #include "flexdef.h"
 diff -ur src.old/usr.bin/lex/misc.c src/usr.bin/lex/misc.c
 --- src.old/usr.bin/lex/misc.c	2002-06-30 07:25:04.000000000 +0200
 +++ src/usr.bin/lex/misc.c	2004-04-07 23:51:53.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/misc.c,v 2.47 95/04/28 11:39:39 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/misc.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/nfa.c src/usr.bin/lex/nfa.c
 --- src.old/usr.bin/lex/nfa.c	2002-06-30 07:25:04.000000000 +0200
 +++ src/usr.bin/lex/nfa.c	2004-04-07 23:52:01.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/nfa.c,v 2.17 95/03/04 16:11:42 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/nfa.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/sym.c src/usr.bin/lex/sym.c
 --- src.old/usr.bin/lex/sym.c	2002-06-30 07:25:04.000000000 +0200
 +++ src/usr.bin/lex/sym.c	2004-04-07 23:52:10.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/sym.c,v 2.19 95/03/04 16:11:04 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/sym.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/tblcmp.c src/usr.bin/lex/tblcmp.c
 --- src.old/usr.bin/lex/tblcmp.c	2002-06-30 07:25:04.000000000 +0200
 +++ src/usr.bin/lex/tblcmp.c	2004-04-07 23:52:21.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/tblcmp.c,v 2.11 94/11/05 17:08:28 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/tblcmp.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 +#endif
  
  #include "flexdef.h"
  
 diff -ur src.old/usr.bin/lex/yylex.c src/usr.bin/lex/yylex.c
 --- src.old/usr.bin/lex/yylex.c	2002-06-30 07:25:04.000000000 +0200
 +++ src/usr.bin/lex/yylex.c	2004-04-07 23:52:30.000000000 +0200
 @@ -28,7 +28,9 @@
  
  /* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.13 95/03/04 16:10:41 vern Exp $ */
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/lex/yylex.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 +#endif
  
  #include <ctype.h>
  #include "flexdef.h"
 diff -ur src.old/usr.bin/make/arch.c src/usr.bin/make/arch.c
 --- src.old/usr.bin/make/arch.c	2002-10-24 01:16:42.000000000 +0200
 +++ src/usr.bin/make/arch.c	2004-04-07 23:53:15.000000000 +0200
 @@ -39,7 +39,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/arch.c,v 1.33 2002/10/23 23:16:42 jmallett Exp $");
 +#endif
  
  /*-
   * arch.c --
 diff -ur src.old/usr.bin/make/buf.c src/usr.bin/make/buf.c
 --- src.old/usr.bin/make/buf.c	2002-10-09 05:42:09.000000000 +0200
 +++ src/usr.bin/make/buf.c	2004-04-07 23:53:42.000000000 +0200
 @@ -40,7 +40,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/buf.c,v 1.18 2002/10/09 03:42:09 jmallett Exp $");
 +#endif
  
  /*-
   * buf.c --
 diff -ur src.old/usr.bin/make/compat.c src/usr.bin/make/compat.c
 --- src.old/usr.bin/make/compat.c	2003-10-03 23:33:39.000000000 +0200
 +++ src/usr.bin/make/compat.c	2004-04-07 23:53:50.000000000 +0200
 @@ -40,7 +40,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/compat.c,v 1.36 2003/10/03 21:33:39 ru Exp $");
 +#endif
  
  /*-
   * compat.c --
 diff -ur src.old/usr.bin/make/cond.c src/usr.bin/make/cond.c
 --- src.old/usr.bin/make/cond.c	2003-09-07 04:16:10.000000000 +0200
 +++ src/usr.bin/make/cond.c	2004-04-07 23:53:58.000000000 +0200
 @@ -40,7 +40,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/cond.c,v 1.27 2003/09/07 02:16:10 imp Exp $");
 +#endif
  
  /*-
   * cond.c --
 diff -ur src.old/usr.bin/make/dir.c src/usr.bin/make/dir.c
 --- src.old/usr.bin/make/dir.c	2003-10-02 23:30:30.000000000 +0200
 +++ src/usr.bin/make/dir.c	2004-04-07 23:54:09.000000000 +0200
 @@ -40,7 +40,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/dir.c,v 1.32 2003/10/02 21:30:30 ru Exp $");
 +#endif
  
  /*-
   * dir.c --
 diff -ur src.old/usr.bin/make/for.c src/usr.bin/make/for.c
 --- src.old/usr.bin/make/for.c	2004-03-10 22:51:06.000000000 +0100
 +++ src/usr.bin/make/for.c	2004-04-07 23:54:20.000000000 +0200
 @@ -37,7 +37,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/for.c,v 1.21 2004/03/10 21:51:06 ru Exp $");
 +#endif
  
  /*-
   * for.c --
 diff -ur src.old/usr.bin/make/hash.c src/usr.bin/make/hash.c
 --- src.old/usr.bin/make/hash.c	2002-10-09 05:42:10.000000000 +0200
 +++ src/usr.bin/make/hash.c	2004-04-07 23:54:29.000000000 +0200
 @@ -40,7 +40,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/hash.c,v 1.18 2002/10/09 03:42:10 jmallett Exp $");
 +#endif
  
  /* hash.c --
   *
 diff -ur src.old/usr.bin/make/job.c src/usr.bin/make/job.c
 --- src.old/usr.bin/make/job.c	2002-12-01 14:38:25.000000000 +0100
 +++ src/usr.bin/make/job.c	2004-04-07 23:54:41.000000000 +0200
 @@ -40,7 +40,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/job.c,v 1.48 2002/12/01 13:38:25 ru Exp $");
 +#endif
  
  #ifndef OLD_JOKE
  #define	OLD_JOKE 0
 diff -ur src.old/usr.bin/make/lst.lib/lstAppend.c src/usr.bin/make/lst.lib/lstAppend.c
 --- src.old/usr.bin/make/lst.lib/lstAppend.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstAppend.c	2004-04-07 23:57:02.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAppend.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstAtEnd.c src/usr.bin/make/lst.lib/lstAtEnd.c
 --- src.old/usr.bin/make/lst.lib/lstAtEnd.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstAtEnd.c	2004-04-07 23:57:15.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAtEnd.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstAtFront.c src/usr.bin/make/lst.lib/lstAtFront.c
 --- src.old/usr.bin/make/lst.lib/lstAtFront.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstAtFront.c	2004-04-07 23:57:28.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAtFront.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstClose.c src/usr.bin/make/lst.lib/lstClose.c
 --- src.old/usr.bin/make/lst.lib/lstClose.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstClose.c	2004-04-07 23:57:38.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstClose.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstConcat.c src/usr.bin/make/lst.lib/lstConcat.c
 --- src.old/usr.bin/make/lst.lib/lstConcat.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstConcat.c	2004-04-08 00:04:39.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstDatum.c src/usr.bin/make/lst.lib/lstDatum.c
 --- src.old/usr.bin/make/lst.lib/lstDatum.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstDatum.c	2004-04-08 00:04:50.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDatum.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstDeQueue.c src/usr.bin/make/lst.lib/lstDeQueue.c
 --- src.old/usr.bin/make/lst.lib/lstDeQueue.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstDeQueue.c	2004-04-08 00:05:05.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDeQueue.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstDestroy.c src/usr.bin/make/lst.lib/lstDestroy.c
 --- src.old/usr.bin/make/lst.lib/lstDestroy.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstDestroy.c	2004-04-08 00:05:18.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstDupl.c src/usr.bin/make/lst.lib/lstDupl.c
 --- src.old/usr.bin/make/lst.lib/lstDupl.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstDupl.c	2004-04-08 00:05:29.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstEnQueue.c src/usr.bin/make/lst.lib/lstEnQueue.c
 --- src.old/usr.bin/make/lst.lib/lstEnQueue.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstEnQueue.c	2004-04-08 00:05:41.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstEnQueue.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstFind.c src/usr.bin/make/lst.lib/lstFind.c
 --- src.old/usr.bin/make/lst.lib/lstFind.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstFind.c	2004-04-08 00:05:57.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstFindFrom.c src/usr.bin/make/lst.lib/lstFindFrom.c
 --- src.old/usr.bin/make/lst.lib/lstFindFrom.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstFindFrom.c	2004-04-08 00:06:07.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstFirst.c src/usr.bin/make/lst.lib/lstFirst.c
 --- src.old/usr.bin/make/lst.lib/lstFirst.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstFirst.c	2004-04-08 00:06:20.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFirst.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstForEach.c src/usr.bin/make/lst.lib/lstForEach.c
 --- src.old/usr.bin/make/lst.lib/lstForEach.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstForEach.c	2004-04-08 00:06:30.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstForEachFrom.c src/usr.bin/make/lst.lib/lstForEachFrom.c
 --- src.old/usr.bin/make/lst.lib/lstForEachFrom.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstForEachFrom.c	2004-04-08 00:06:41.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstInit.c src/usr.bin/make/lst.lib/lstInit.c
 --- src.old/usr.bin/make/lst.lib/lstInit.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstInit.c	2004-04-08 00:06:52.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstInit.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstInsert.c src/usr.bin/make/lst.lib/lstInsert.c
 --- src.old/usr.bin/make/lst.lib/lstInsert.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstInsert.c	2004-04-08 00:07:01.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstInsert.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstIsAtEnd.c src/usr.bin/make/lst.lib/lstIsAtEnd.c
 --- src.old/usr.bin/make/lst.lib/lstIsAtEnd.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstIsAtEnd.c	2004-04-08 00:07:16.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstIsAtEnd.c,v 1.7 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstIsEmpty.c src/usr.bin/make/lst.lib/lstIsEmpty.c
 --- src.old/usr.bin/make/lst.lib/lstIsEmpty.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstIsEmpty.c	2004-04-08 00:07:39.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstIsEmpty.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstLast.c src/usr.bin/make/lst.lib/lstLast.c
 --- src.old/usr.bin/make/lst.lib/lstLast.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstLast.c	2004-04-08 00:07:50.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstLast.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstMember.c src/usr.bin/make/lst.lib/lstMember.c
 --- src.old/usr.bin/make/lst.lib/lstMember.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstMember.c	2004-04-08 00:08:01.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstMember.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstNext.c src/usr.bin/make/lst.lib/lstNext.c
 --- src.old/usr.bin/make/lst.lib/lstNext.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstNext.c	2004-04-08 00:08:13.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstNext.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstOpen.c src/usr.bin/make/lst.lib/lstOpen.c
 --- src.old/usr.bin/make/lst.lib/lstOpen.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstOpen.c	2004-04-08 00:08:24.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstOpen.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstRemove.c src/usr.bin/make/lst.lib/lstRemove.c
 --- src.old/usr.bin/make/lst.lib/lstRemove.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstRemove.c	2004-04-08 00:08:36.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstReplace.c src/usr.bin/make/lst.lib/lstReplace.c
 --- src.old/usr.bin/make/lst.lib/lstReplace.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstReplace.c	2004-04-08 00:08:50.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstReplace.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/lst.lib/lstSucc.c src/usr.bin/make/lst.lib/lstSucc.c
 --- src.old/usr.bin/make/lst.lib/lstSucc.c	2002-10-09 04:00:22.000000000 +0200
 +++ src/usr.bin/make/lst.lib/lstSucc.c	2004-04-08 00:09:01.000000000 +0200
 @@ -38,7 +38,9 @@
  
  #ifndef lint
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
 +#endif
  #endif /* not lint */
  
  /*-
 diff -ur src.old/usr.bin/make/main.c src/usr.bin/make/main.c
 --- src.old/usr.bin/make/main.c	2003-12-13 16:26:27.000000000 +0100
 +++ src/usr.bin/make/main.c	2004-04-08 00:11:55.000000000 +0200
 @@ -46,7 +46,12 @@
  #endif
  #endif /* not lint */
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/main.c,v 1.86 2003/12/13 15:26:27 des Exp $");
 +#endif
  
  /*-
   * main.c --
 diff -ur src.old/usr.bin/make/make.c src/usr.bin/make/make.c
 --- src.old/usr.bin/make/make.c	2002-10-24 01:16:43.000000000 +0200
 +++ src/usr.bin/make/make.c	2004-04-07 23:55:00.000000000 +0200
 @@ -39,7 +39,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/make.c,v 1.24 2002/10/23 23:16:43 jmallett Exp $");
 +#endif
  
  /*-
   * make.c --
 diff -ur src.old/usr.bin/make/parse.c src/usr.bin/make/parse.c
 --- src.old/usr.bin/make/parse.c	2004-03-10 22:51:06.000000000 +0100
 +++ src/usr.bin/make/parse.c	2004-04-07 23:55:10.000000000 +0200
 @@ -39,7 +39,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.53 2004/03/10 21:51:06 ru Exp $");
 +#endif
  
  /*-
   * parse.c --
 diff -ur src.old/usr.bin/make/str.c src/usr.bin/make/str.c
 --- src.old/usr.bin/make/str.c	2004-01-25 13:28:36.000000000 +0100
 +++ src/usr.bin/make/str.c	2004-04-07 23:55:21.000000000 +0200
 @@ -39,7 +39,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/str.c,v 1.29 2004/01/25 12:28:36 ru Exp $");
 +#endif
  
  #include "make.h"
  
 diff -ur src.old/usr.bin/make/suff.c src/usr.bin/make/suff.c
 --- src.old/usr.bin/make/suff.c	2002-12-30 22:18:11.000000000 +0100
 +++ src/usr.bin/make/suff.c	2004-04-07 23:55:30.000000000 +0200
 @@ -39,7 +39,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/suff.c,v 1.28 2002/12/30 21:18:11 schweikh Exp $");
 +#endif
  
  /*-
   * suff.c --
 diff -ur src.old/usr.bin/make/targ.c src/usr.bin/make/targ.c
 --- src.old/usr.bin/make/targ.c	2002-10-24 01:16:43.000000000 +0200
 +++ src/usr.bin/make/targ.c	2004-04-07 23:55:40.000000000 +0200
 @@ -39,7 +39,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/targ.c,v 1.26 2002/10/23 23:16:43 jmallett Exp $");
 +#endif
  
  /*-
   * targ.c --
 diff -ur src.old/usr.bin/make/util.c src/usr.bin/make/util.c
 --- src.old/usr.bin/make/util.c	2002-10-10 21:27:48.000000000 +0200
 +++ src/usr.bin/make/util.c	2004-04-07 23:55:52.000000000 +0200
 @@ -40,7 +40,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/util.c,v 1.12 2002/10/10 19:27:48 jmallett Exp $");
 +#endif
  
  /*-
   * util.c --
 diff -ur src.old/usr.bin/make/var.c src/usr.bin/make/var.c
 --- src.old/usr.bin/make/var.c	2004-01-12 11:35:46.000000000 +0100
 +++ src/usr.bin/make/var.c	2004-04-07 23:56:05.000000000 +0200
 @@ -39,7 +39,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/var.c,v 1.46 2004/01/12 10:35:46 harti Exp $");
 +#endif
  
  /*-
   * var.c --
 diff -ur src.old/usr.bin/make/var_modify.c src/usr.bin/make/var_modify.c
 --- src.old/usr.bin/make/var_modify.c	2002-10-29 13:11:56.000000000 +0100
 +++ src/usr.bin/make/var_modify.c	2004-04-07 23:56:15.000000000 +0200
 @@ -40,7 +40,12 @@
   */
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/make/var_modify.c,v 1.2 2002/10/29 12:11:56 jmallett Exp $");
 +#endif
  
  #include    <ctype.h>
  #include    <sys/types.h>
 diff -ur src.old/usr.bin/yacc/closure.c src/usr.bin/yacc/closure.c
 --- src.old/usr.bin/yacc/closure.c	2002-04-09 13:39:05.000000000 +0200
 +++ src/usr.bin/yacc/closure.c	2004-04-08 00:09:22.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/closure.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 +#endif
  
  #include <stdlib.h>
  #include "defs.h"
 diff -ur src.old/usr.bin/yacc/error.c src/usr.bin/yacc/error.c
 --- src.old/usr.bin/yacc/error.c	2002-04-09 13:39:05.000000000 +0200
 +++ src/usr.bin/yacc/error.c	2004-04-08 00:09:31.000000000 +0200
 @@ -40,7 +40,9 @@
  #endif
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/error.c,v 1.15 2002/04/09 11:39:05 ru Exp $");
 +#endif
  
  /* routines for printing error messages  */
  
 diff -ur src.old/usr.bin/yacc/lalr.c src/usr.bin/yacc/lalr.c
 --- src.old/usr.bin/yacc/lalr.c	2002-06-11 13:27:20.000000000 +0200
 +++ src/usr.bin/yacc/lalr.c	2004-04-08 00:09:41.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/lalr.c,v 1.15 2002/06/11 11:27:20 robert Exp $");
 +#endif
  
  #include <limits.h>
  #include <stdlib.h>
 diff -ur src.old/usr.bin/yacc/lr0.c src/usr.bin/yacc/lr0.c
 --- src.old/usr.bin/yacc/lr0.c	2002-06-11 13:27:20.000000000 +0200
 +++ src/usr.bin/yacc/lr0.c	2004-04-08 00:09:51.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/lr0.c,v 1.13 2002/06/11 11:27:20 robert Exp $");
 +#endif
  
  #include <limits.h>
  #include <stdlib.h>
 diff -ur src.old/usr.bin/yacc/main.c src/usr.bin/yacc/main.c
 --- src.old/usr.bin/yacc/main.c	2004-03-05 03:05:56.000000000 +0100
 +++ src/usr.bin/yacc/main.c	2004-04-08 00:10:01.000000000 +0200
 @@ -41,7 +41,12 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/main.c,v 1.22 2004/03/05 02:05:56 wes Exp $");
 +#endif
  
  #include <paths.h>
  #include <signal.h>
 diff -ur src.old/usr.bin/yacc/mkpar.c src/usr.bin/yacc/mkpar.c
 --- src.old/usr.bin/yacc/mkpar.c	2002-04-09 13:39:05.000000000 +0200
 +++ src/usr.bin/yacc/mkpar.c	2004-04-08 00:10:11.000000000 +0200
 @@ -40,7 +40,9 @@
  #endif
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/mkpar.c,v 1.19 2002/04/09 11:39:05 ru Exp $");
 +#endif
  
  #include <stdlib.h>
  #include "defs.h"
 diff -ur src.old/usr.bin/yacc/output.c src/usr.bin/yacc/output.c
 --- src.old/usr.bin/yacc/output.c	2002-06-11 13:27:20.000000000 +0200
 +++ src/usr.bin/yacc/output.c	2004-04-08 00:10:20.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/output.c,v 1.28 2002/06/11 11:27:20 robert Exp $");
 +#endif
  
  #include <limits.h>
  #include <stdlib.h>
 diff -ur src.old/usr.bin/yacc/reader.c src/usr.bin/yacc/reader.c
 --- src.old/usr.bin/yacc/reader.c	2002-08-25 15:23:09.000000000 +0200
 +++ src/usr.bin/yacc/reader.c	2004-04-08 00:10:28.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/reader.c,v 1.19 2002/08/25 13:23:09 charnier Exp $");
 +#endif
  
  #include <limits.h>
  #include <stdlib.h>
 diff -ur src.old/usr.bin/yacc/skeleton.c src/usr.bin/yacc/skeleton.c
 --- src.old/usr.bin/yacc/skeleton.c	2003-02-12 19:03:55.000000000 +0100
 +++ src/usr.bin/yacc/skeleton.c	2004-04-08 00:10:37.000000000 +0200
 @@ -41,7 +41,12 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $");
 +#endif
  
  #include "defs.h"
  
 diff -ur src.old/usr.bin/yacc/symtab.c src/usr.bin/yacc/symtab.c
 --- src.old/usr.bin/yacc/symtab.c	2002-04-09 13:39:05.000000000 +0200
 +++ src/usr.bin/yacc/symtab.c	2004-04-08 00:10:48.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/symtab.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 +#endif
  
  #include <stdlib.h>
  #include <string.h>
 diff -ur src.old/usr.bin/yacc/verbose.c src/usr.bin/yacc/verbose.c
 --- src.old/usr.bin/yacc/verbose.c	2002-04-09 13:39:05.000000000 +0200
 +++ src/usr.bin/yacc/verbose.c	2004-04-08 00:10:57.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/verbose.c,v 1.13 2002/04/09 11:39:05 ru Exp $");
 +#endif
  
  #include <stdlib.h>
  #include "defs.h"
 diff -ur src.old/usr.bin/yacc/warshall.c src/usr.bin/yacc/warshall.c
 --- src.old/usr.bin/yacc/warshall.c	2002-04-09 13:39:05.000000000 +0200
 +++ src/usr.bin/yacc/warshall.c	2004-04-08 00:11:05.000000000 +0200
 @@ -41,7 +41,9 @@
  #endif
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.bin/yacc/warshall.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 +#endif
  
  #include "defs.h"
  
 diff -ur src.old/usr.sbin/mtree/compare.c src/usr.sbin/mtree/compare.c
 --- src.old/usr.sbin/mtree/compare.c	2004-01-11 20:25:56.000000000 +0100
 +++ src/usr.sbin/mtree/compare.c	2004-04-07 23:47:27.000000000 +0200
 @@ -33,7 +33,12 @@
  #endif /* not lint */
  #endif
  #include <sys/cdefs.h>
 +#ifndef __unused
 +#define __unused
 +#endif
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/compare.c,v 1.33 2004/01/11 19:25:56 phk Exp $");
 +#endif
  
  #include <sys/param.h>
  #include <sys/stat.h>
 diff -ur src.old/usr.sbin/mtree/create.c src/usr.sbin/mtree/create.c
 --- src.old/usr.sbin/mtree/create.c	2004-01-11 20:38:48.000000000 +0100
 +++ src/usr.sbin/mtree/create.c	2004-04-07 23:47:38.000000000 +0200
 @@ -33,7 +33,9 @@
  #endif /* not lint */
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/create.c,v 1.36 2004/01/11 19:38:48 phk Exp $");
 +#endif
  
  #include <sys/param.h>
  #include <sys/stat.h>
 diff -ur src.old/usr.sbin/mtree/excludes.c src/usr.sbin/mtree/excludes.c
 --- src.old/usr.sbin/mtree/excludes.c	2003-10-21 10:27:05.000000000 +0200
 +++ src/usr.sbin/mtree/excludes.c	2004-04-07 23:48:01.000000000 +0200
 @@ -28,7 +28,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/excludes.c,v 1.8 2003/10/21 08:27:05 phk Exp $");
 +#endif
  
  #include <sys/types.h>
  #include <sys/time.h>		/* XXX for mtree.h */
 diff -ur src.old/usr.sbin/mtree/misc.c src/usr.sbin/mtree/misc.c
 --- src.old/usr.sbin/mtree/misc.c	2004-01-11 20:25:56.000000000 +0100
 +++ src/usr.sbin/mtree/misc.c	2004-04-07 23:48:11.000000000 +0200
 @@ -33,7 +33,9 @@
  #endif /*not lint */
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.15 2004/01/11 19:25:56 phk Exp $");
 +#endif
  
  #include <sys/types.h>
  #include <sys/stat.h>
 diff -ur src.old/usr.sbin/mtree/mtree.c src/usr.sbin/mtree/mtree.c
 --- src.old/usr.sbin/mtree/mtree.c	2004-01-11 20:38:48.000000000 +0100
 +++ src/usr.sbin/mtree/mtree.c	2004-04-07 23:48:22.000000000 +0200
 @@ -39,7 +39,9 @@
  #endif /* not lint */
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.28 2004/01/11 19:38:48 phk Exp $");
 +#endif
  
  #include <sys/param.h>
  #include <sys/stat.h>
 diff -ur src.old/usr.sbin/mtree/spec.c src/usr.sbin/mtree/spec.c
 --- src.old/usr.sbin/mtree/spec.c	2003-11-19 16:28:21.000000000 +0100
 +++ src/usr.sbin/mtree/spec.c	2004-04-07 23:48:33.000000000 +0200
 @@ -33,7 +33,9 @@
  #endif /* not lint */
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.21 2003/11/19 15:28:21 phk Exp $");
 +#endif
  
  #include <sys/types.h>
  #include <sys/stat.h>
 diff -ur src.old/usr.sbin/mtree/specspec.c src/usr.sbin/mtree/specspec.c
 --- src.old/usr.sbin/mtree/specspec.c	2003-11-30 19:06:02.000000000 +0100
 +++ src/usr.sbin/mtree/specspec.c	2004-04-07 23:48:43.000000000 +0200
 @@ -6,7 +6,9 @@
   */
  
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/specspec.c,v 1.2 2003/11/30 18:06:02 phk Exp $");
 +#endif
  
  #include <err.h>
  #include <grp.h>
 diff -ur src.old/usr.sbin/mtree/verify.c src/usr.sbin/mtree/verify.c
 --- src.old/usr.sbin/mtree/verify.c	2004-01-11 20:25:56.000000000 +0100
 +++ src/usr.sbin/mtree/verify.c	2004-04-07 23:48:53.000000000 +0200
 @@ -33,7 +33,9 @@
  #endif /* not lint */
  #endif
  #include <sys/cdefs.h>
 +#ifdef __FBSDID
  __FBSDID("$FreeBSD: src/usr.sbin/mtree/verify.c,v 1.23 2004/01/11 19:25:56 phk Exp $");
 +#endif
  
  #include <sys/param.h>
  #include <sys/stat.h>
 
 --dDRMvlgZJXvWKvBx--
Responsible-Changed-From-To: freebsd-bugs->obrien 
Responsible-Changed-By: obrien 
Responsible-Changed-When: Fri Apr 9 19:39:44 PDT 2004 
Responsible-Changed-Why:  
I'll take a look at this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65306 

Adding to audit trail manually by bugmeister:

 See also bin/69010.
State-Changed-From-To: open->closed 
State-Changed-By: obrien 
State-Changed-When: Thu May 31 23:03:36 UTC 2012 
State-Changed-Why:  
OBE 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65306 
>Unformatted:
