13 files changed, 10 insertions, 36 deletions

diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 5e2b520a8345..302777a965eb 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 74983452f698..f1ebfc178d9f 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)buf.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index ee13bf0d5421..bb3f50142471 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index bbcebd6bb869..88917aaad567 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 95e6bfb45fc6..614acd1f518c 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 0d907cafaa46..9db93c3eeaff 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -29,8 +29,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -38,7 +36,7 @@
 static char sccsid[] = "@(#)for.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 021980053ea3..6b50fd364cc9 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)hash.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 7fac04e3ba17..ef619399f935 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 6c53c052caac..fcf8422df55e 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 524d9001aa95..9607d5b20983 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 0bec455ead4e..81b427a939c3 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 04ab41889195..6394ae2ab0a7 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)targ.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index f9ae2b126d06..31dfd02a813c 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -34,8 +34,6 @@
  * 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$
  */
 
 #ifndef lint
@@ -43,7 +41,7 @@
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */