diff --git a/audio/raproxy/Makefile b/audio/raproxy/Makefile
index 5c38278ba8df..03f18021f852 100644
--- a/audio/raproxy/Makefile
+++ b/audio/raproxy/Makefile
@@ -3,7 +3,7 @@
 # Date created:			  Sat May 8, 1999
 # Whom:				  Nick Sayer (nsayer@freebsd.org)
 #
-# $Id: Makefile,v 1.2 1999/05/09 17:45:58 nsayer Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	raproxy3.0b1
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index 398d5774dc50..fa433510b0f4 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Jul, 15, 1997
 # Whom:                 cracauer@cons.org "Martin Cracauer"
 #
-# $Id: Makefile,v 1.8 1999/05/31 04:52:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	scsh-0.5.1
diff --git a/print/Makefile b/print/Makefile
index e17826802490..aaefa105e4e3 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.94 1999/06/28 19:50:55 cpiazza Exp $
+# $FreeBSD$
 #
 
     SUBDIR += a2ps-a4
diff --git a/print/a2ps-a4/Makefile b/print/a2ps-a4/Makefile
index 912e36af4b08..5410bce1652e 100644
--- a/print/a2ps-a4/Makefile
+++ b/print/a2ps-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 4e82ad7d8adc..a21b581c3392 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.26 1999/04/17 16:12:02 chuckr Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	a2ps-4.12
diff --git a/print/a2ps-letterdj/Makefile b/print/a2ps-letterdj/Makefile
index b6759f6c35e8..3ece50455ac2 100644
--- a/print/a2ps-letterdj/Makefile
+++ b/print/a2ps-letterdj/Makefile
@@ -3,7 +3,7 @@
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	letterdj
diff --git a/print/a2ps43-a4/Makefile b/print/a2ps43-a4/Makefile
index 5e815c3627eb..1d916c69e8ea 100644
--- a/print/a2ps43-a4/Makefile
+++ b/print/a2ps43-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         6 November 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/a2ps43-letter/Makefile b/print/a2ps43-letter/Makefile
index 90e0a2e69725..d4037da687bd 100644
--- a/print/a2ps43-letter/Makefile
+++ b/print/a2ps43-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         6 November 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.17 1998/10/30 08:35:29 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	a2ps
diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index e126892ffea8..0b363dd8b00c 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -3,7 +3,7 @@
 # Date created:		99/06/16
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1999/07/09 13:17:16 foxfair Exp $
+# $FreeBSD$
 #
 
 DISTNAME?=	commfont # dummy
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index a91f31e7e85c..355381210109 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 November 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.12 1999/07/21 14:55:38 marcel Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ar302lin
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index a1a94cfae70d..feaa1ebd74bf 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 November 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.15 1999/07/21 14:55:39 marcel Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	linux-ar-40
diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile
index e126892ffea8..0b363dd8b00c 100644
--- a/print/acroread5-commfont/Makefile
+++ b/print/acroread5-commfont/Makefile
@@ -3,7 +3,7 @@
 # Date created:		99/06/16
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1999/07/09 13:17:16 foxfair Exp $
+# $FreeBSD$
 #
 
 DISTNAME?=	commfont # dummy
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index a1a94cfae70d..feaa1ebd74bf 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 November 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.15 1999/07/21 14:55:39 marcel Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	linux-ar-40
diff --git a/print/afm/Makefile b/print/afm/Makefile
index af8d31231705..de1363b48bcf 100644
--- a/print/afm/Makefile
+++ b/print/afm/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.8 1999/08/23 04:23:48 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	afm
diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index e271af890587..b2e5a1fa5ff2 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 September 1998
 # Whom:			giffunip
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/13 16:16:41 taoka Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	amsps
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 6a0b233c1305..f6df8b9615ef 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -3,7 +3,7 @@
 # Date created: 	Tue Nov 14 18:29:48 MET 1995
 # Whom: 		Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/08/21 01:59:43 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	apsfilter-5.1.3
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index 6a0b233c1305..f6df8b9615ef 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -3,7 +3,7 @@
 # Date created: 	Tue Nov 14 18:29:48 MET 1995
 # Whom: 		Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/08/21 01:59:43 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	apsfilter-5.1.3
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index c25a25c43ea7..7b5bc97b826a 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 August 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.4 1998/10/13 02:48:49 jseger Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	asprint
diff --git a/print/bibcard/Makefile b/print/bibcard/Makefile
index 68a5277a11e9..6cd4537f390b 100644
--- a/print/bibcard/Makefile
+++ b/print/bibcard/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Mon Feb 03, 1997
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.7 1998/10/20 01:48:29 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	bibcard.6.4
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index ddb901a75d62..ba66f61d79e0 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 July 1997
 # Whom:			dbader@eece.unm.edu
 #
-# $Id: Makefile,v 1.4 1998/04/19 18:03:26 mph Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	bibview-2.2
diff --git a/print/c2ps-a4/Makefile b/print/c2ps-a4/Makefile
index b09b92516dba..1eb19fe4813e 100644
--- a/print/c2ps-a4/Makefile
+++ b/print/c2ps-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        19 March 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/c2ps-letter/Makefile b/print/c2ps-letter/Makefile
index aae94eb01480..9dcbf55f55eb 100644
--- a/print/c2ps-letter/Makefile
+++ b/print/c2ps-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:        19 March 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.6 1998/10/30 08:35:31 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	c2ps-4.0
diff --git a/print/cdlabelgen/Makefile b/print/cdlabelgen/Makefile
index 7d7a6e1e07dc..8d9572ccbee4 100644
--- a/print/cdlabelgen/Makefile
+++ b/print/cdlabelgen/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 23 00:19:55 MET DST 1999
 # Whom:			Juergen Lock <nox@jelal.kn-bremen.de>
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/28 19:49:58 cpiazza Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	cdlabelgen-1.5.0
diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index 8cfc4c9cff79..e1580e35f81b 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 September 1998
 # Whom:			giffunip
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/13 16:15:33 taoka Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	cmps
diff --git a/print/detex/Makefile b/print/detex/Makefile
index 911c3f04dfbb..4cd6bac0fbe0 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Mon Feb 17, 1997
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/25 10:53:08 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	detex-2.6
diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile
index 5219e0ce7af5..b0e664501be8 100644
--- a/print/dvi2tty/Makefile
+++ b/print/dvi2tty/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17th February 1997
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 #
-# $Id: Makefile,v 1.4 1998/08/23 22:10:12 asami Exp $
+# $FreeBSD$
 #
       
 DISTNAME=	dvi2tty
diff --git a/print/dvi2xx/Makefile b/print/dvi2xx/Makefile
index 3e96040725f7..7335bfa219ae 100644
--- a/print/dvi2xx/Makefile
+++ b/print/dvi2xx/Makefile
@@ -3,7 +3,7 @@
 # Date created:         14 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.13 1996/12/17 12:33:37 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	dvi2xx
diff --git a/print/dvips/Makefile b/print/dvips/Makefile
index ab82d398645f..e069905481cf 100644
--- a/print/dvips/Makefile
+++ b/print/dvips/Makefile
@@ -3,7 +3,7 @@
 # Date created:         30 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.18 1998/09/25 19:42:58 jmz Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	dvips576
diff --git a/print/dvips2ascii/Makefile b/print/dvips2ascii/Makefile
index 8507221d68e4..a5a0650643cd 100644
--- a/print/dvips2ascii/Makefile
+++ b/print/dvips2ascii/Makefile
@@ -3,7 +3,7 @@
 # Date created:         7 Aug 1997
 # Whom:                 eserte@cs.tu-berlin.de
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME= 	dvips2ascii-1.0
diff --git a/print/dviselect/Makefile b/print/dviselect/Makefile
index cc52a6b87ec3..777637096831 100644
--- a/print/dviselect/Makefile
+++ b/print/dviselect/Makefile
@@ -3,7 +3,7 @@
 # Date created:         12 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.12 1998/10/12 12:45:44 jseger Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	dviselect
diff --git a/print/enscript-a4/Makefile b/print/enscript-a4/Makefile
index e097e39f9a83..1b9cca9af614 100644
--- a/print/enscript-a4/Makefile
+++ b/print/enscript-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:			24 Jul, 1997
 # Whom:				kline
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index 8cc0e9fea846..37a7bf0057c3 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:			24 Jul, 1997
 # Whom:				kline
 #
-# $Id: Makefile,v 1.7 1998/11/20 04:15:07 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       enscript-1.6.1
diff --git a/print/enscript-letterdj/Makefile b/print/enscript-letterdj/Makefile
index 39db991179c3..9f5766e22a0d 100644
--- a/print/enscript-letterdj/Makefile
+++ b/print/enscript-letterdj/Makefile
@@ -3,7 +3,7 @@
 # Date created:			24 Jul, 1997
 # Whom:				kline
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	letterdj
diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile
index f71c39907b1c..4c21a5131b51 100644
--- a/print/enscriptfonts/Makefile
+++ b/print/enscriptfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:			15 June, 1998
 # Whom:				kline
 #
-# $Id: Makefile,v 1.2 1998/11/20 01:12:26 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	enscript_fonts-0.75
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 1f76bf7c2920..6b5cbeca5bf3 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -3,7 +3,7 @@
 # Date created:		January 24, 1998
 # Whom:			jseger@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1998/12/14 15:39:26 sada Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	freetype-1.2
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 1f76bf7c2920..6b5cbeca5bf3 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		January 24, 1998
 # Whom:			jseger@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1998/12/14 15:39:26 sada Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	freetype-1.2
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 533a27af37d1..b7fee9b6ca3e 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/08/22 04:01:03 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ggv-0.51
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 533a27af37d1..b7fee9b6ca3e 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/08/22 04:01:03 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ggv-0.51
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 29ecab5ef0e8..d75e7959e2d8 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 December 1998
 # Whom:			giffunip
 #
-# $Id: Makefile,v 1.32 1999/02/03 11:11:56 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.10
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 438c03ed4bc4..f4a2193c419b 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.33 1999/05/15 01:14:34 andreas Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostscript-5.50
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index bd6cbf073804..54f298540183 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.11 1998/10/20 01:48:36 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ghostview-1.5
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 7c7f39d978b0..199fd61ed235 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -3,7 +3,7 @@
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1999/05/30 03:52:57 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gnome-print-0.4
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 7c7f39d978b0..199fd61ed235 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -3,7 +3,7 @@
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1999/05/30 03:52:57 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gnome-print-0.4
diff --git a/print/gp/Makefile b/print/gp/Makefile
index cbba6c501e8d..ae51af682c4c 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.11 1998/11/20 04:39:06 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	GP-2.5p2
diff --git a/print/gsfonts/Makefile b/print/gsfonts/Makefile
index 91c5399cb07f..ac89a2843f91 100644
--- a/print/gsfonts/Makefile
+++ b/print/gsfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 September 1997
 # Whom:			giffunip
 #
-# $Id: Makefile,v 1.2 1999/01/27 07:41:26 fenner Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gsfonts-5.10
diff --git a/print/gv/Makefile b/print/gv/Makefile
index ee255c98f6e5..56624d5ed0e5 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -4,7 +4,7 @@
 # Date created:		16 Apr 1996
 # Whom:			tg@freebsd.org
 #
-# $Id: Makefile,v 1.19 1998/10/20 01:48:37 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gv-3.5.8
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index e44d46b278db..bb13729f2167 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -3,7 +3,7 @@
 # Date created:         17 Jan 1999
 # Whom:                 Lars Koeller
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/26 03:30:26 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	hp2xx-3.20-png
diff --git a/print/html2latex/Makefile b/print/html2latex/Makefile
index 0bdfc6b80fd2..2fefb23e98ac 100644
--- a/print/html2latex/Makefile
+++ b/print/html2latex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29-March-1996
 # Whom:                 joerg
 #
-# $Id: Makefile,v 1.4 1996/11/17 08:44:41 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	html2latex-0.9c
diff --git a/print/html2ps-a4/Makefile b/print/html2ps-a4/Makefile
index 94f5275e824f..7ab0cb7335f8 100644
--- a/print/html2ps-a4/Makefile
+++ b/print/html2ps-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat Nov 22 12:54:50 CET 1997
 # Whom:			andreas
 #
-# $Id: Makefile,v 1.7 1999/03/31 20:21:49 billf Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	html2ps-1.0b1
diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index 94f5275e824f..7ab0cb7335f8 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat Nov 22 12:54:50 CET 1997
 # Whom:			andreas
 #
-# $Id: Makefile,v 1.7 1999/03/31 20:21:49 billf Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	html2ps-1.0b1
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 67849a94efe0..7f416d584cbf 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 December 1998
 # Whom:                 Sean Kelly <kelly@plutotech.com>
 #
-# $Id: Makefile,v 1.3 1999/04/02 13:24:44 nik Exp $
+# $FreeBSD$
 #
 # When jadetex-2.3 goes mainstream, it will replace jadetex-2.1
 # currently in the Comprehensive TeX Archive Network (CTAN).  When
diff --git a/print/klyx/Makefile b/print/klyx/Makefile
index 752b6501614c..5bf40464b446 100644
--- a/print/klyx/Makefile
+++ b/print/klyx/Makefile
@@ -3,7 +3,7 @@
 # Date created:        23 May 1998
 # Whom:                Hans Petter Bieker <hanspb@persbraten.vgs.no>
 #
-# $Id: Makefile,v 1.10 1999/05/24 02:31:48 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	klyx-0.10.0
diff --git a/print/latex/Makefile b/print/latex/Makefile
index 25f32c0c598e..81bbe50f1f3c 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.37 1999/08/22 18:59:45 mharo Exp $
+# $FreeBSD$
 #
 
 VERSION=	99.06
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 7c7f39d978b0..199fd61ed235 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,7 +3,7 @@
 # Date created:				15 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1999/05/30 03:52:57 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gnome-print-0.4
diff --git a/print/lout/Makefile b/print/lout/Makefile
index edadfb21dcbc..215ee18fa11b 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -3,7 +3,7 @@
 # Date created:      10/22/96
 # Whom:              oly@world.std.com
 #
-# $Id: Makefile,v 1.5 1999/03/19 18:53:19 flathill Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lout-3.13
diff --git a/print/lprps-a4/Makefile b/print/lprps-a4/Makefile
index 4f3660199390..359b00591866 100644
--- a/print/lprps-a4/Makefile
+++ b/print/lprps-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile
index 0fd234094675..4bd08d8d920b 100644
--- a/print/lprps-letter/Makefile
+++ b/print/lprps-letter/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.5 1998/10/30 08:35:36 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lprps-2.5
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 7248f3030c1d..af6946ad9605 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.30 1999/06/08 22:14:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lyx-1.0.3
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 7248f3030c1d..af6946ad9605 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.30 1999/06/08 22:14:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lyx-1.0.3
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 7248f3030c1d..af6946ad9605 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.30 1999/06/08 22:14:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lyx-1.0.3
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 7248f3030c1d..af6946ad9605 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.30 1999/06/08 22:14:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lyx-1.0.3
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 7248f3030c1d..af6946ad9605 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.30 1999/06/08 22:14:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	lyx-1.0.3
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 7801771d2608..153f5ac735de 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 Mar 1999
 # Whom:			CHOI Junho <cjh@kr.freebsd.org>
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=	magicfilter-1.2
diff --git a/print/magicfilter/files/printcap.sample b/print/magicfilter/files/printcap.sample
index d92bb108fc72..45df63c57561 100644
--- a/print/magicfilter/files/printcap.sample
+++ b/print/magicfilter/files/printcap.sample
@@ -1,5 +1,5 @@
 #	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $Id: printcap,v 1.9 1998/02/04 12:09:06 ache Exp $
+# $FreeBSD$
 
 #
 # This enables a simple local "raw" printer, hooked up to the first
diff --git a/print/makeindex/Makefile b/print/makeindex/Makefile
index 11dcb1425bb2..68b46e54f5c7 100644
--- a/print/makeindex/Makefile
+++ b/print/makeindex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         12 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.11 1997/02/18 16:57:16 jmz Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	makeindex-3.0.8
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 1d193d0553e6..bd4beeac5cd0 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 Mar 1998
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.12 1998/10/20 01:46:39 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	mgv-3.1.5
diff --git a/print/mp-a4/Makefile b/print/mp-a4/Makefile
index e3a01579fb3a..0192dc776c0e 100644
--- a/print/mp-a4/Makefile
+++ b/print/mp-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         11 July 1996
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index cf01e60f958a..9deb8021eb15 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         11 July 1996
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.9 1998/10/30 08:35:37 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	mp-3.0.1
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index c09519eb27b7..83e4fa49adc7 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 February 1998
 # Whom:			Kapil Chowksey
 #
-# $Id$
+# $FreeBSD$
 
 DISTNAME=	mpage-2.5
 CATEGORIES=	print
diff --git a/print/musixtex/Makefile b/print/musixtex/Makefile
index 9a33d39a0b89..03c4198b984b 100644
--- a/print/musixtex/Makefile
+++ b/print/musixtex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 july 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.22 1999/06/15 16:05:56 jmz Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       musixtex-T97
diff --git a/print/offix-printer/Makefile b/print/offix-printer/Makefile
index c1937de3cdcb..8ac6dabe9e93 100644
--- a/print/offix-printer/Makefile
+++ b/print/offix-printer/Makefile
@@ -3,7 +3,7 @@
 # Date created:      28 Jun 1997
 # Whom:              Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
 #
-# $Id: Makefile,v 1.5 1998/09/27 03:16:05 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	Printer-2.4
diff --git a/print/pbm2ppa/Makefile b/print/pbm2ppa/Makefile
index 7a0b54c4dbd5..ee86c6ccd37a 100644
--- a/print/pbm2ppa/Makefile
+++ b/print/pbm2ppa/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1998
 # Whom:			smace@freebsd.org
 #
-# $Id: Makefile,v 1.5 1999/08/23 04:23:52 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ppa-0.8.6
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index e4b5a9d5975e..6b8bcbe4313e 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Jan 18 17:03:33 CET 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1999/07/30 21:03:54 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pdflib-2.0
diff --git a/print/pdflib3/Makefile b/print/pdflib3/Makefile
index e4b5a9d5975e..6b8bcbe4313e 100644
--- a/print/pdflib3/Makefile
+++ b/print/pdflib3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Jan 18 17:03:33 CET 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1999/07/30 21:03:54 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pdflib-2.0
diff --git a/print/pdflib4/Makefile b/print/pdflib4/Makefile
index e4b5a9d5975e..6b8bcbe4313e 100644
--- a/print/pdflib4/Makefile
+++ b/print/pdflib4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Jan 18 17:03:33 CET 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1999/07/30 21:03:54 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pdflib-2.0
diff --git a/print/pdq/Makefile b/print/pdq/Makefile
index 55636a3bf467..c4f62c7ace8d 100644
--- a/print/pdq/Makefile
+++ b/print/pdq/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 May 1999
 # Whom:			Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/17 10:32:38 foxfair Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pdq-2.1.1
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index 4e767b515f59..195d9d948290 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/12/22
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1999/03/31 16:41:30 sada Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	perlftlib-1.2
diff --git a/print/pkfonts118/Makefile b/print/pkfonts118/Makefile
index e4a25df3d87f..cd9a77ed5ccc 100644
--- a/print/pkfonts118/Makefile
+++ b/print/pkfonts118/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1998/12/02 09:07:18 obrien Exp $
+# $FreeBSD$
 #
 
 RESOLUTION=	118
diff --git a/print/pkfonts240/Makefile b/print/pkfonts240/Makefile
index 1da527871f7a..8cf09aeef375 100644
--- a/print/pkfonts240/Makefile
+++ b/print/pkfonts240/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1998/12/02 09:07:19 obrien Exp $
+# $FreeBSD$
 #
 
 RESOLUTION=	240
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index 733903c267ed..d386712d4cca 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Mar 1996
 # Whom:			Hideaki Ohmon <ohmon@tom.sfc.keio.ac.jp>
 #
-# $Id: Makefile,v 1.14 1998/12/10 17:24:32 vanilla Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pkfonts
diff --git a/print/pkfonts360/Makefile b/print/pkfonts360/Makefile
index a758f8d13e93..280e0575a9da 100644
--- a/print/pkfonts360/Makefile
+++ b/print/pkfonts360/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1998/12/02 09:07:19 obrien Exp $
+# $FreeBSD$
 #
 
 RESOLUTION=	360
diff --git a/print/pkfonts400/Makefile b/print/pkfonts400/Makefile
index 7412ef31b47d..c54179ec7bae 100644
--- a/print/pkfonts400/Makefile
+++ b/print/pkfonts400/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1998/12/02 09:07:19 obrien Exp $
+# $FreeBSD$
 #
 
 RESOLUTION=	400
diff --git a/print/pkfonts600/Makefile b/print/pkfonts600/Makefile
index bedb1464a695..aa83ce8f8d99 100644
--- a/print/pkfonts600/Makefile
+++ b/print/pkfonts600/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1998/12/01 03:06:38 asami Exp $
+# $FreeBSD$
 #
 
 RESOLUTION=	600
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 7a0b54c4dbd5..ee86c6ccd37a 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1998
 # Whom:			smace@freebsd.org
 #
-# $Id: Makefile,v 1.5 1999/08/23 04:23:52 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	ppa-0.8.6
diff --git a/print/psutils-a4/Makefile b/print/psutils-a4/Makefile
index c369416b430c..570dacd115a1 100644
--- a/print/psutils-a4/Makefile
+++ b/print/psutils-a4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 September 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id$
+# $FreeBSD$
 #
 
 PAPERSIZE=	a4
diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile
index e8ff82eedd1d..93112fcb0dad 100644
--- a/print/psutils-letter/Makefile
+++ b/print/psutils-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 September 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.18 1998/11/20 04:15:15 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	psutils-p17
diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile
index eeb6a2942a96..8d0f0968fa61 100644
--- a/print/rlpr/Makefile
+++ b/print/rlpr/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 April 1999
 # Whom:			Mikhail Teterin
 #
-# $Id: Makefile,v 1.3 1999/08/22 18:59:46 mharo Exp $
+# $FreeBSD$
 
 DISTNAME=	rlpr-2.00
 CATEGORIES=	print net
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index aaa974a6d923..abaa4c87bc9d 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Jan 1995
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1997/08/26 07:12:18 tg Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	rtf2LaTeX.1.5
diff --git a/print/t1utils/Makefile b/print/t1utils/Makefile
index 052a129805f5..ae1d34bced19 100644
--- a/print/t1utils/Makefile
+++ b/print/t1utils/Makefile
@@ -3,7 +3,7 @@
 # Date created:        6 January 1999
 # Whom:                mwm
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/03 03:03:06 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	t1utils-1.11
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 47cd832d83ff..de55523f20f6 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 December 1996
 # Whom:			Bernd Rosauer <br@netland.inka.de>
 #
-# $Id: Makefile,v 1.32 1999/08/25 14:25:38 tg Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	teTeX-1.0.6
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 47cd832d83ff..de55523f20f6 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 December 1996
 # Whom:			Bernd Rosauer <br@netland.inka.de>
 #
-# $Id: Makefile,v 1.32 1999/08/25 14:25:38 tg Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	teTeX-1.0.6
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 482579ebbdec..a3605a76c342 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.35 1999/08/28 02:17:27 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	web2c-7.1
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index b553eaba6f12..823a380af9b7 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.15 1999/08/22 18:59:47 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	texinfo
diff --git a/print/tgif2tex/Makefile b/print/tgif2tex/Makefile
index dbb26c52dcdc..cbb1731ff4fe 100644
--- a/print/tgif2tex/Makefile
+++ b/print/tgif2tex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 Mar 1998
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/13 03:36:35 kuriyama Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	tgif2tex
diff --git a/print/tr2latex/Makefile b/print/tr2latex/Makefile
index 2f5952969404..f23f28c4d181 100644
--- a/print/tr2latex/Makefile
+++ b/print/tr2latex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         25 Jan 1995
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
-# $Id: Makefile,v 1.10 1999/05/04 08:43:34 tg Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	tr2latex
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 43a1d787d8cf..5be2f2bc498b 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 August 1996
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.22 1998/10/03 21:34:09 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	transfig.3.2.1
diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile
index 75e2c5998f4f..9a2c28a6a81d 100644
--- a/print/virtualpaper/Makefile
+++ b/print/virtualpaper/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 June 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.11 1999/08/22 18:59:48 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	virtualpaper-1.4
diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index ddcd2374fd46..30596a1ff42e 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.24 1998/10/20 01:48:37 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	xdvi-20
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 3ba42102d471..c24b2ae5e73f 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -3,7 +3,7 @@
 # Date created:        26 Feb 1998
 # Whom:                Kentaro Inagaki <JBD01226@niftyserve.ne.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/13 04:07:18 jseger Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	xdvik-20a
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index 9a86e07fbae5..eace33a35675 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -3,7 +3,7 @@
 # Date created:				06 Nov 1997
 # Whom:					Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1998/02/18 15:45:29 tg Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	xmbibtex-1.5
diff --git a/print/xtem/Makefile b/print/xtem/Makefile
index 2c9a79ca443c..138562674148 100644
--- a/print/xtem/Makefile
+++ b/print/xtem/Makefile
@@ -3,7 +3,7 @@
 # Date created:         01 June 1997
 # Whom:                 Peter Cornelius <pc@inr.fzk.de>
 #
-# $Id: Makefile,v 1.6 1998/10/12 18:16:47 jseger Exp $
+# $FreeBSD$
 
 DISTNAME=	xtem_texmenu.6.18
 PKGNAME=	xtem-6.18
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index d457b44c06a4..c3bc579bbbd8 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1999/03/17 08:08:37 taoka Exp $
+# $FreeBSD$
 #
 
 PKGNAME=	yatex-mule-1.66
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index f875f39e712e..649a6fecb061 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1999/03/17 06:57:38 taoka Exp $
+# $FreeBSD$
 #
 
 PKGNAME=	yatex-xemacs-mule-1.66
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index efd633215677..13da1741b1f8 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1999/03/17 06:57:37 taoka Exp $
+# $FreeBSD$
 #
 
 PKGNAME=	yatex-xemacs-1.66
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 3c59613e11d1..2439670ee504 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.9 1999/05/01 04:03:29 taoka Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	yatex1.66
diff --git a/russian/Makefile b/russian/Makefile
index b68230653622..7dd58beeaf95 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1999/05/03 03:59:22 steve Exp $
+# $FreeBSD$
 #
 
     SUBDIR += X.language
diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 2ed41f7824dc..82c455849798 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.23 1999/08/22 23:33:18 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       ru-X11-3.3
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index dcd3086a9403..2284ff3eebec 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Apr 10 22:30:36 EEST 1999
 # Whom:                 vns@delta.odessa.ua
 #
-# $Id: Makefile,v 1.4 1999/08/22 23:33:20 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	apache_1.3.6
diff --git a/russian/cyrproxy/Makefile b/russian/cyrproxy/Makefile
index 2cd1c82c492d..4b801bc682dc 100644
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@@ -3,7 +3,7 @@
 # Date created:				20 May 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1997/10/23 13:38:44 itojun Exp $
+# $FreeBSD$
 #
 
 DISTNAME=		cyrproxy-1.4.2
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index 3a413edeaac5..e3a5aaeff381 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.9 1997/11/10 04:32:08 ache Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       d1489-1.4
diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index c6342837f4ad..3fb2087b38d2 100644
--- a/russian/elm.language/Makefile
+++ b/russian/elm.language/Makefile
@@ -2,7 +2,7 @@
 # Date created:         2 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.13 1999/08/23 04:23:38 mharo Exp $
+# $FreeBSD$
 #
 
 PKGNAME=        ru-elm-2.4ME
diff --git a/russian/gd/Makefile b/russian/gd/Makefile
index 47b736b10eb1..6426e82771aa 100644
--- a/russian/gd/Makefile
+++ b/russian/gd/Makefile
@@ -3,7 +3,7 @@
 # Date created:         17 Aug 1998
 # Whom:                 gsm@infosite.ru
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/05 14:10:52 kuriyama Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       gd1.3
diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile
index a8f954c11256..ed846d4a8507 100644
--- a/russian/koi8r-ps/Makefile
+++ b/russian/koi8r-ps/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 July 1999
 # Whom:                 mi@aldan.algebra.com
 #
-# $Id: Makefile,v 1.2 1999/08/23 04:23:49 mharo Exp $
+# $FreeBSD$
 
 DISTNAME=	koi8rPS-1.0
 CATEGORIES=	russian print
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index 022a267fb330..4e90676aa6ab 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         8 Apr 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.15 1998/12/02 05:11:02 asami Exp $
+# $FreeBSD$
 #
 
 PKGNAME=        ru-netscape-3.01
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index 0dab812f37c9..ead9ee226bbd 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         4 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.25 1999/08/28 02:17:28 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       pgp26ru
diff --git a/russian/pine.language/Makefile b/russian/pine.language/Makefile
index 53ba4c8b7b1a..bc9a905380c6 100644
--- a/russian/pine.language/Makefile
+++ b/russian/pine.language/Makefile
@@ -2,7 +2,7 @@
 # Date created:         2 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1999/08/22 23:33:23 mharo Exp $
+# $FreeBSD$
 #
 
 PKGNAME=        ru-pine-3.96
diff --git a/russian/rispell/Makefile b/russian/rispell/Makefile
index a4fc1a160cf0..814e0d52136d 100644
--- a/russian/rispell/Makefile
+++ b/russian/rispell/Makefile
@@ -3,7 +3,7 @@
 # Date created:         16 Dec 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1997/12/23 07:23:24 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       rispell
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile
index 02b514d833ee..944c997ed4d9 100644
--- a/russian/wmcyrx/Makefile
+++ b/russian/wmcyrx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		04 Janyary 1999
 # Whom:			Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=       cyrx2.0
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index ec8b891a1923..791c6f665bb2 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 Jan 1998
 # Whom:			Igor Vinokurov <igor@zynaps.ru>
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/06 12:19:18 flathill Exp $
+# $FreeBSD$
 
 DISTNAME=	xruskb-1.9.3
 CATEGORIES=	russian x11
diff --git a/security/Makefile b/security/Makefile
index 810e00d2c2ef..bac79c10c634 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.62 1999/06/28 22:55:58 nsayer Exp $
+# $FreeBSD$
 #
 
     SUBDIR += bjorb
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 56c63fdf9182..d9f750c2e36e 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		May 16, 1998
 # Whom:			issei@jp.FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1999/03/26 08:51:51 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	bjorb-0.5.5p1
diff --git a/security/bro/Makefile b/security/bro/Makefile
index 9116fd7af3c8..ee248b3629e0 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Sat Feb 28, 1998
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.9 1999/02/13 20:03:59 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	vp-bro-0.5-alpha
diff --git a/security/bugs/Makefile b/security/bugs/Makefile
index 9114b652f51c..6f00b62a79cd 100644
--- a/security/bugs/Makefile
+++ b/security/bugs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 June 1998
 # Whom:			Stephane Legrand
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=		bugs-1.8.1
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index a2bd746bb7ab..41b15aeb8079 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1997
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.3 1999/06/21 17:23:53 jdp Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	cfs-1.3.3bf
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 46ef19c3838d..a5bc34968c9e 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 August 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.3 1999/03/31 16:41:31 sada Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	checkpassword-0.81
diff --git a/security/cops/Makefile b/security/cops/Makefile
index 9a7991330f50..ed3677d58dfe 100644
--- a/security/cops/Makefile
+++ b/security/cops/Makefile
@@ -3,7 +3,7 @@
 # Date created:				29 August 1996
 # Whom:					oly
 #
-# $Id: Makefile,v 1.4 1998/06/04 04:11:55 vanilla Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	cops.1.04
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 041ace4ed378..3da27ec8f973 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -5,7 +5,7 @@
 # Whom:			David O'Brien <obrien@FreeBSD.org>
 # Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.8 1999/08/27 22:30:08 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	crack5.0
diff --git a/security/donkey/Makefile b/security/donkey/Makefile
index 8bb9497092a8..d6ca17b27bf4 100644
--- a/security/donkey/Makefile
+++ b/security/donkey/Makefile
@@ -3,7 +3,7 @@
 # Date created:			17 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1996/09/19 11:33:48 max Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	donkey-0.5
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index d131135a92e9..f5d7933de1f6 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1999
 # Whom:                Kris Kennaway <kris@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/03/16 11:18:18 kris Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	fakebo
diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile
index 96ff2cce5bb8..ed44e7e3b449 100644
--- a/security/firewalk/Makefile
+++ b/security/firewalk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun May 3, 1999
 # Whom:			shipley@dis.org
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=	firewalk-0.99beta
diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index 0b7833ef91d7..28aa3650f035 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -4,7 +4,7 @@
 # Date created:                         15th June 1996
 # Whom:                                 gpalmer
 #
-# $Id: Makefile,v 1.12 1998/12/31 22:15:37 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	fwtk2.1
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 9cc6edd32662..61ef95096671 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sep 30, 1998
 # Whom:			kuriyama@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.14 1999/08/12 15:10:08 kuriyama Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gnupg-0.9.10
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 9cc6edd32662..61ef95096671 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sep 30, 1998
 # Whom:			kuriyama@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.14 1999/08/12 15:10:08 kuriyama Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gnupg-0.9.10
diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile
index dd940971535a..b5bffa04d43b 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Mon Mai 10 1999
 # Whom:				domi@saargate.de
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=	gpasman-1.1.3
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index 907f13c2e778..a09800648f21 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 March 1999
 # Whom:			Chris Piazza <cpiazza@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1999/05/29 03:55:46 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	gtkportscan-1.1
diff --git a/security/identify/Makefile b/security/identify/Makefile
index fde8b8df5bd7..07d9d247a3f5 100644
--- a/security/identify/Makefile
+++ b/security/identify/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 March 1999
 # Whom:			nsayer@quack.kfu.com
 #
-# $Id: Makefile,v 1.3 1999/04/11 22:42:07 jseger Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	identify-0.7
diff --git a/security/john/Makefile b/security/john/Makefile
index f1326a2cad5e..ca88c42c8f4d 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Sun Mar 09, 1997
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.7 1998/12/07 08:59:21 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	john-1.6
diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile
index 6e9b309995ee..491f8860ce6c 100644
--- a/security/keyprint/Makefile
+++ b/security/keyprint/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat May 29 02:05:00 PDT 1999
 # Whom:			mharo@FreeBSD.org
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=       keyprint-1.0
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 2f343c3cd859..e24b12e5f72f 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=		krb5-1.0.6
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 2f343c3cd859..e24b12e5f72f 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=		krb5-1.0.6
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 2f343c3cd859..e24b12e5f72f 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=		krb5-1.0.6
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 2f343c3cd859..e24b12e5f72f 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=		krb5-1.0.6
diff --git a/security/l0pht-watch/Makefile b/security/l0pht-watch/Makefile
index 407414d712f5..dbcc6f6e31e1 100644
--- a/security/l0pht-watch/Makefile
+++ b/security/l0pht-watch/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 Jan 1999
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=	l0pht-watch
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 71522cf8c78a..fa85cdfd8640 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.6 1998/01/25 20:42:37 torstenb Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	libident-0.22
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index a136fdf1cc8e..22135ad5ed66 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Jun 28 18:02:04 PDT 1999
 # Whom:			nsayer@freebsd.org
 #
-# $Id: Makefile,v 1.2 1999/06/29 01:03:45 nsayer Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	libmcrypt-2.2
diff --git a/security/libparanoia/Makefile b/security/libparanoia/Makefile
index f7b978f4a021..b4c13fb0b5f5 100644
--- a/security/libparanoia/Makefile
+++ b/security/libparanoia/Makefile
@@ -3,7 +3,7 @@
 # Date created:				1 Jan 1999
 # Whom:					Alexandre Snarskii <snar@paranoia.ru>
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/10 13:12:12 jseger Exp $
+# $FreeBSD$
 
 DISTNAME=	libparanoia-1.3
 CATEGORIES=	security
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index fae1324d0271..9100bacc52e3 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Jun 28 17:59:13 PDT 1999
 # Whom:			nsayer@freebsd.org
 #
-# $Id: Makefile,v 1.2 1999/06/29 01:00:49 nsayer Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	mhash-0.5.0
diff --git a/security/nbaudit/Makefile b/security/nbaudit/Makefile
index a637126a8700..82086ce53551 100644
--- a/security/nbaudit/Makefile
+++ b/security/nbaudit/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Mon Feb 03, 1997
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.3 1999/04/16 10:21:50 kris Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nat10
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 2f42d9efdc36..22762c99b11d 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 May 1999
 # Whom:			Anders Nordby <anders@fix.no>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/17 10:26:38 foxfair Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nessus-alpha2-fix4
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 2f42d9efdc36..22762c99b11d 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 May 1999
 # Whom:			Anders Nordby <anders@fix.no>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/17 10:26:38 foxfair Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nessus-alpha2-fix4
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 29b44198dc11..3ac48f1d7f73 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.17 1999/04/07 19:00:04 fenner Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nmap-2.2-BETA4
diff --git a/security/nmap/files/nmap.1 b/security/nmap/files/nmap.1
index 091ef06c37dc..b80aaa89fe46 100644
--- a/security/nmap/files/nmap.1
+++ b/security/nmap/files/nmap.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .\" .TH NMAP 1L local
 .Dd August 4, 1998
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index f4f8755ff5f3..3de481e81082 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.4 1999/02/08 11:58:17 obrien Exp $
+@comment $FreeBSD$
 bin/nmap
 bin/nmapfe
 bin/xnmap
diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 29b44198dc11..3ac48f1d7f73 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.17 1999/04/07 19:00:04 fenner Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nmap-2.2-BETA4
diff --git a/security/nmapfe/files/nmap.1 b/security/nmapfe/files/nmap.1
index 091ef06c37dc..b80aaa89fe46 100644
--- a/security/nmapfe/files/nmap.1
+++ b/security/nmapfe/files/nmap.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .\" .TH NMAP 1L local
 .Dd August 4, 1998
diff --git a/security/nmapfe/pkg-plist b/security/nmapfe/pkg-plist
index f4f8755ff5f3..3de481e81082 100644
--- a/security/nmapfe/pkg-plist
+++ b/security/nmapfe/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.4 1999/02/08 11:58:17 obrien Exp $
+@comment $FreeBSD$
 bin/nmap
 bin/nmapfe
 bin/xnmap
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index e9b69b7fbeac..df9313a0a6e7 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun Jan  3 19:36:27 CET 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.33 1999/08/09 18:48:11 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	openssl-0.9.4
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index e9b69b7fbeac..df9313a0a6e7 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun Jan  3 19:36:27 CET 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.33 1999/08/09 18:48:11 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	openssl-0.9.4
diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile
index 6e9b309995ee..491f8860ce6c 100644
--- a/security/opieprint/Makefile
+++ b/security/opieprint/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat May 29 02:05:00 PDT 1999
 # Whom:			mharo@FreeBSD.org
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=       keyprint-1.0
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 29488286730e..49278347ac3f 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 11th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.3 1998/09/15 21:31:52 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	RadiusPerl-0.05
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 3919b4c5fa0f..59cf6b6c7c30 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.9 1998/09/15 21:31:52 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	Crypt-DES-1.0
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 8d5bf25263b0..d5bc2a14f0e6 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.10 1998/09/15 21:31:52 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	Crypt-IDEA-1.0
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index 13e88a116ee4..eeb051f5bad5 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				1999/04/07
 # Whom:					ache
 #
-# $Id: Makefile,v 1.2 1999/04/12 08:24:16 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       Digest-MD5-2.08
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 23a6fe708c0c..fe87d896ce27 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.10 1998/08/16 00:48:41 hoek Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	MD5-1.7
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index b6305df3eb61..d8f77a1c368d 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -3,7 +3,7 @@
 # Date created:		January 2, 1998
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.6 1999/04/19 04:00:32 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	PGP-Sign-0.15
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 1874b209b209..afd957711ec3 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.12 1998/09/15 21:31:53 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	PGP-0.3a
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index e42c24034a51..2c769c39ad39 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
 # Date created:         8 Jul 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.28 1999/08/27 22:30:09 mharo Exp $
+# $FreeBSD$
 #
 
 # Pick an initial default, else it doesn't get set in the INDEX.
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index dc22e39a6ac3..d361cc7288e7 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -5,7 +5,7 @@
 # Date created:         10 Feb 1998
 # Whom:                 markm
 #
-# $Id: Makefile,v 1.28 1999/04/08 19:05:45 billf Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pgp50i
diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index dc22e39a6ac3..d361cc7288e7 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -5,7 +5,7 @@
 # Date created:         10 Feb 1998
 # Whom:                 markm
 #
-# $Id: Makefile,v 1.28 1999/04/08 19:05:45 billf Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pgp50i
diff --git a/security/pidentd/Makefile b/security/pidentd/Makefile
index a2321cc170f1..6b3fc47fbd96 100644
--- a/security/pidentd/Makefile
+++ b/security/pidentd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.24 1998/04/24 14:01:33 ache Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       pidentd-2.8.5
diff --git a/security/pidentd/scripts/configure b/security/pidentd/scripts/configure
index 5ef4bb155961..9eae94b8fdba 100644
--- a/security/pidentd/scripts/configure
+++ b/security/pidentd/scripts/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: configure,v 1.4 1996/02/09 12:01:48 adam Exp $
+# $FreeBSD$
 #
 
 for i in src/paths.h identd.man idecrypt.man ; do
diff --git a/security/pktsuckers/Makefile b/security/pktsuckers/Makefile
index aca20bea386b..2cdc664f4944 100644
--- a/security/pktsuckers/Makefile
+++ b/security/pktsuckers/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 May 1999
 # Whom:			Warren Toomey <wkt@cs.adfa.edu.au>
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=	pktsuckers1_2
diff --git a/security/portscanner/Makefile b/security/portscanner/Makefile
index 65df57d62063..767ebdb14d73 100644
--- a/security/portscanner/Makefile
+++ b/security/portscanner/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: Makefile,v 1.4 1998/12/03 19:12:28 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	PortScanner-1.0
diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile
index 10936bb06660..fcd18eb10747 100644
--- a/security/portsentry/Makefile
+++ b/security/portsentry/Makefile
@@ -3,7 +3,7 @@
 # Date created:		3 January 1998
 # Whom:			chris@still.whet.org
 #
-# $Id: Makefile,v 1.3 1999/04/19 19:49:32 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	portsentry-0.90
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 937459ebe496..8d0bfb489106 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -4,7 +4,7 @@
 # Date created:         2 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1998/12/18 17:58:23 sada Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       rsaref20.1996
diff --git a/security/skip/Makefile b/security/skip/Makefile
index 3869c798c8cb..d1a4c8384491 100644
--- a/security/skip/Makefile
+++ b/security/skip/Makefile
@@ -3,7 +3,7 @@
 # Date created:         		26 November 1997
 # Whom:                 		Archie L. Cobbs <archie@whistle.com>
 #
-# $Id: Makefile,v 1.11 1999/08/28 02:17:28 mharo Exp $
+# $FreeBSD$
 
 DISTNAME=		skip-1.0
 CATEGORIES=		security
diff --git a/security/skip/files/skip.mtree b/security/skip/files/skip.mtree
index 463428e14f62..15401fa9d74d 100644
--- a/security/skip/files/skip.mtree
+++ b/security/skip/files/skip.mtree
@@ -1,4 +1,4 @@
-# $Id: skip.mtree,v 1.2 1999/03/10 19:50:31 julian Exp $
+# $FreeBSD$
 
 /set type=dir uname=root gname=wheel mode=0755
 .
diff --git a/security/slush/Makefile b/security/slush/Makefile
index 855acd080473..e20b291a5940 100644
--- a/security/slush/Makefile
+++ b/security/slush/Makefile
@@ -3,7 +3,7 @@
 # Date created:			  Sun May 3, 1999
 # Whom:                 	shipley@dis.org
 #
-# $Id: Makefile,v 1.2 1999/05/09 17:53:12 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	slush-0.1.1
diff --git a/security/smurflog/Makefile b/security/smurflog/Makefile
index 8e15dc9a9c40..74b474cdc422 100644
--- a/security/smurflog/Makefile
+++ b/security/smurflog/Makefile
@@ -3,7 +3,7 @@
 # Date created:				7/06/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.6 1999/01/07 18:32:45 nectar Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	smurflog-2.1
diff --git a/security/sniff/Makefile b/security/sniff/Makefile
index 4c344fc01f6d..2d92b33f92f8 100644
--- a/security/sniff/Makefile
+++ b/security/sniff/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 December 1998
 # Whom:			Rick & Samu
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=	sniff-1.0
diff --git a/security/snort/Makefile b/security/snort/Makefile
index e821c7d0c07c..e91b2fbd4752 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Aug  2 12:04:08 CEST 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1999/08/02 10:14:10 dirk Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	snort-1.2.1
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 282ddf542ec3..48621be9404f 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.78 1999/08/09 17:12:44 markm Exp $
+# $FreeBSD$
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 94705c5fc4b6..4cdc672c49d4 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Oct 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.82 1999/06/24 19:29:50 obrien Exp $
+# $FreeBSD$
 #
 # Maximal ssh2 package requires YES values for
 # USE_SSH1, USE_TCPWRAP
diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index 2b000a3405f4..4e67d4c5e120 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 February 1999
 # Whom:			Alex Le Heux
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/06 17:49:44 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	sslproxy.1998_Jun_14
diff --git a/security/strobe/Makefile b/security/strobe/Makefile
index 55246bd4eb7d..6978c5c06f3a 100644
--- a/security/strobe/Makefile
+++ b/security/strobe/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Sep 1996
 # Whom:			proff
 #
-# $Id: Makefile,v 1.5 1999/03/09 00:16:14 jseger Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	strobe-1.06
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 986ee6b255ae..c44cbb28d0ee 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mon Jan 11 11:53:54 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.5 1999/06/06 16:54:51 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	stunnel-3.3
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index e482f1287778..4b50330c7243 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.21 1999/08/07 21:10:50 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	cu-sudo.v1.5.9p4
diff --git a/security/super/Makefile b/security/super/Makefile
index 75f8eec5022c..8f7beb7e4387 100644
--- a/security/super/Makefile
+++ b/security/super/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Fri Mar 18, 1997
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.10 1999/02/26 13:00:44 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	super-3.12.1
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 191cd2884029..1b917d080eef 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -3,7 +3,7 @@
 # Date created:					May 2 97
 # Whom:						jfitz
 #
-# $Id$
+# $FreeBSD$
 #
 
 DISTNAME=      	swatch-2.2
diff --git a/security/tcp_wrapper/Makefile b/security/tcp_wrapper/Makefile
index 319b8230bc1b..1bcfba945367 100644
--- a/security/tcp_wrapper/Makefile
+++ b/security/tcp_wrapper/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.19 1998/09/14 21:08:53 smace Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       tcp_wrappers_7.6
diff --git a/security/tcp_wrapper/scripts/configure b/security/tcp_wrapper/scripts/configure
index cf7ffc8bdf27..ae837b94e861 100644
--- a/security/tcp_wrapper/scripts/configure
+++ b/security/tcp_wrapper/scripts/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 FILES="hosts_access.3 hosts_access.5 tcpd.8 tcpdchk.8 tcpdmatch.8"
diff --git a/security/tripwire-131/Makefile b/security/tripwire-131/Makefile
index b8a2e9ebe99f..707ff26e975d 100644
--- a/security/tripwire-131/Makefile
+++ b/security/tripwire-131/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1997
 # Whom:			Joe Greco <jgreco@ns.sol.net>
 #
-# $Id: Makefile,v 1.4 1998/12/01 08:33:29 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       tripwire-1.2
diff --git a/security/tripwire-131/files/conf-freebsd2.h b/security/tripwire-131/files/conf-freebsd2.h
index e97290da4786..d8f2942118e3 100644
--- a/security/tripwire-131/files/conf-freebsd2.h
+++ b/security/tripwire-131/files/conf-freebsd2.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * conf-freebsd2.h
diff --git a/security/tripwire-131/files/tw.conf.freebsd2 b/security/tripwire-131/files/tw.conf.freebsd2
index 4e2a6b398236..c195f38872e2 100644
--- a/security/tripwire-131/files/tw.conf.freebsd2
+++ b/security/tripwire-131/files/tw.conf.freebsd2
@@ -1,4 +1,4 @@
-# $Id: tw.conf.freebsd2,v 1.3 1998/07/28 17:54:21 obrien Exp $
+# $FreeBSD$
 #
 # tripwire.config
 # Generic version for FreeBSD
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index b8a2e9ebe99f..707ff26e975d 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1997
 # Whom:			Joe Greco <jgreco@ns.sol.net>
 #
-# $Id: Makefile,v 1.4 1998/12/01 08:33:29 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       tripwire-1.2
diff --git a/security/tripwire/files/conf-freebsd2.h b/security/tripwire/files/conf-freebsd2.h
index e97290da4786..d8f2942118e3 100644
--- a/security/tripwire/files/conf-freebsd2.h
+++ b/security/tripwire/files/conf-freebsd2.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * conf-freebsd2.h
diff --git a/security/tripwire/files/tw.conf.freebsd2 b/security/tripwire/files/tw.conf.freebsd2
index 4e2a6b398236..c195f38872e2 100644
--- a/security/tripwire/files/tw.conf.freebsd2
+++ b/security/tripwire/files/tw.conf.freebsd2
@@ -1,4 +1,4 @@
-# $Id: tw.conf.freebsd2,v 1.3 1998/07/28 17:54:21 obrien Exp $
+# $FreeBSD$
 #
 # tripwire.config
 # Generic version for FreeBSD
diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile
index b8a2e9ebe99f..707ff26e975d 100644
--- a/security/tripwire12/Makefile
+++ b/security/tripwire12/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1997
 # Whom:			Joe Greco <jgreco@ns.sol.net>
 #
-# $Id: Makefile,v 1.4 1998/12/01 08:33:29 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       tripwire-1.2
diff --git a/security/tripwire12/files/conf-freebsd2.h b/security/tripwire12/files/conf-freebsd2.h
index e97290da4786..d8f2942118e3 100644
--- a/security/tripwire12/files/conf-freebsd2.h
+++ b/security/tripwire12/files/conf-freebsd2.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * conf-freebsd2.h
diff --git a/security/tripwire12/files/tw.conf.freebsd2 b/security/tripwire12/files/tw.conf.freebsd2
index 4e2a6b398236..c195f38872e2 100644
--- a/security/tripwire12/files/tw.conf.freebsd2
+++ b/security/tripwire12/files/tw.conf.freebsd2
@@ -1,4 +1,4 @@
-# $Id: tw.conf.freebsd2,v 1.3 1998/07/28 17:54:21 obrien Exp $
+# $FreeBSD$
 #
 # tripwire.config
 # Generic version for FreeBSD
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index 2117f1a03504..034203c33b7f 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thur Sept 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.9 1999/08/22 18:59:58 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nlxb318e
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index 9f843f32837f..8f4aea3aa5c4 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -3,7 +3,7 @@
 # Date created:				28 June 1996
 # Whom:					markm
 #
-# $Id: Makefile,v 1.9 1999/08/22 18:59:59 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	xinetd-2.1.8.6b6
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 29b44198dc11..3ac48f1d7f73 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.17 1999/04/07 19:00:04 fenner Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	nmap-2.2-BETA4
diff --git a/security/zenmap/files/nmap.1 b/security/zenmap/files/nmap.1
index 091ef06c37dc..b80aaa89fe46 100644
--- a/security/zenmap/files/nmap.1
+++ b/security/zenmap/files/nmap.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .\" .TH NMAP 1L local
 .Dd August 4, 1998
diff --git a/security/zenmap/pkg-plist b/security/zenmap/pkg-plist
index f4f8755ff5f3..3de481e81082 100644
--- a/security/zenmap/pkg-plist
+++ b/security/zenmap/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.4 1999/02/08 11:58:17 obrien Exp $
+@comment $FreeBSD$
 bin/nmap
 bin/nmapfe
 bin/xnmap
diff --git a/shells/Makefile b/shells/Makefile
index cb5d2a8e98b6..9e48aeda801e 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 1999/03/31 10:02:12 obrien Exp $
+# $FreeBSD$
 #
 
     SUBDIR += bash1
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 5bc80cba4ba5..e868d8fe5d7f 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.36 1999/06/05 22:31:47 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       bash-2.03
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile
index 0861405d4e0a..45a7b95a0866 100644
--- a/shells/bash1/Makefile
+++ b/shells/bash1/Makefile
@@ -4,7 +4,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.30 1999/03/30 01:31:42 obrien Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       bash-1.14.7
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 5bc80cba4ba5..e868d8fe5d7f 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.36 1999/06/05 22:31:47 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       bash-2.03
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index 5bc80cba4ba5..e868d8fe5d7f 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.36 1999/06/05 22:31:47 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       bash-2.03
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 32e1cdebd1f0..bb16c196cb5e 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       es-0.9-beta1
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 1adc6fd9ffd5..486072ced62a 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -3,7 +3,7 @@
 # Date created:				05/20/1999
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/28 21:01:50 nectar Exp $
+# $FreeBSD$
 #
 
 DISTNAME=		esh-0.8
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index f83da21f1a36..6511c5503b06 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 May 1995
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
-# $Id: Makefile,v 1.18 1998/04/29 07:56:42 tg Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	pdksh-5.2.14
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 1ad9e6e92f05..828a7ba5250f 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun Aug 13 12:36:14 CDT 1995
 # Whom:			erich@rrnet.com
 #
-# $Id: Makefile,v 1.7 1999/03/15 04:34:14 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	rc-1.6
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 398d5774dc50..fa433510b0f4 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Jul, 15, 1997
 # Whom:                 cracauer@cons.org "Martin Cracauer"
 #
-# $Id: Makefile,v 1.8 1999/05/31 04:52:27 steve Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	scsh-0.5.1
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index ee531dc5dfb8..0c802d843565 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/08/22 19:00:00 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       tcsh-6.09
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index c9b7ba6b81a7..37f42eceee56 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:			31 October 1998
 # Whom:				shige
 #
-# $Id: Makefile,v 1.31 1999/06/05 22:31:54 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=	zsh-3.1.6
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 3a2f1e9b218e..a247bde640d4 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -3,7 +3,7 @@
 # Date created:			11 Feb. 1995
 # Whom:				torstenb
 #
-# $Id: Makefile,v 1.28 1999/06/05 22:31:58 mharo Exp $
+# $FreeBSD$
 #
 
 DISTNAME=       zsh-3.0.5