Unify Makefiles -- mostly headers: remove FreeBSD Ids.

Consistent 4 character indentation of SUBDIR entries.

29 files changed, 36 insertions, 59 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index c46e276c0cb..fd69fd19092 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/07/20 19:47:21 wiz Exp $
-# FreeBSD Id: Makefile,v 1.18 1997/05/16 01:42:31 asami Exp 
+# $NetBSD: Makefile,v 1.26 2000/12/12 01:30:36 wiz Exp $
 #
 
     SUBDIR += arc
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index eaddbd54b16..91a6931638e 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/04/03 15:56:14 sakamoto Exp $
-# FreeBSD Id: Makefile,v 1.4 1997/02/16 13:32:59 andreas Exp
+# $NetBSD: Makefile,v 1.18 2000/12/12 01:30:39 wiz Exp $
 #
 
 PKG_MISC_TARGETS?=	benchmark results
diff --git a/cad/Makefile b/cad/Makefile
index b47195f71f9..03c9c2a05e0 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2000/11/27 23:32:11 jtb Exp $
-# FreeBSD Id: Makefile,v 1.8 1997/11/17 10:53:52 tg Exp
+# $NetBSD: Makefile,v 1.32 2000/12/12 01:30:41 wiz Exp $
 #
 
     SUBDIR += acs
diff --git a/comms/Makefile b/comms/Makefile
index 6a2df925f66..1bf981282f7 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/07/08 16:08:08 sakamoto Exp $
-# FreeBSD Id: Makefile,v 1.26 1997/10/13 04:41:06 max Exp
+# $NetBSD: Makefile,v 1.30 2000/12/12 01:30:43 wiz Exp $
 #
 
     SUBDIR += binkd
diff --git a/converters/Makefile b/converters/Makefile
index 40c0d3e4a7a..f60898f423f 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/11/14 21:20:09 itojun Exp $
-# FreeBSD Id: Makefile,v 1.8 1997/11/16 22:45:25 jseger Exp
+# $NetBSD: Makefile,v 1.22 2000/12/12 01:30:45 wiz Exp $
 #
 
     SUBDIR += base64
diff --git a/cross/Makefile b/cross/Makefile
index fee8e20b2e2..466fdb93f73 100644
--- a/cross/Makefile
+++ b/cross/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2000/12/04 13:18:39 agc Exp $
+# $NetBSD: Makefile,v 1.20 2000/12/12 01:30:45 wiz Exp $
+#
 
     SUBDIR += arm-netbsd
     SUBDIR += armv2-netbsd
diff --git a/databases/Makefile b/databases/Makefile
index 1e9252fac64..888a2ba2239 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2000/11/27 01:02:18 wiz Exp $
-# FreeBSD Id: Makefile,v 1.20 1997/07/30 11:47:51 tg Exp 
+# $NetBSD: Makefile,v 1.44 2000/12/12 01:30:45 wiz Exp $
 #
 
     SUBDIR += db
diff --git a/devel/Makefile b/devel/Makefile
index c0b9893d489..51bc1d71de5 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2000/12/08 23:44:25 jtb Exp $
-# FreeBSD Id: Makefile,v 1.78 1997/10/01 08:32:59 cracauer Exp
+# $NetBSD: Makefile,v 1.158 2000/12/12 01:30:46 wiz Exp $
 #
 
     SUBDIR += GConf
diff --git a/editors/Makefile b/editors/Makefile
index 6f6d56c4b65..48d97b9470a 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2000/11/21 05:25:58 kei Exp $
-# FreeBSD Id: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp
+# $NetBSD: Makefile,v 1.38 2000/12/12 01:30:46 wiz Exp $
 #
 
     SUBDIR += abiword
diff --git a/emulators/Makefile b/emulators/Makefile
index 787f22d1714..2788adae25a 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2000/12/06 23:29:53 wiz Exp $
-# FreeBSD Id: Makefile,v 1.14 1997/07/31 07:23:58 max Exp
+# $NetBSD: Makefile,v 1.43 2000/12/12 01:30:47 wiz Exp $
 #
 
     SUBDIR += atari800
diff --git a/finance/Makefile b/finance/Makefile
index a24e25ebc08..ac390133380 100644
--- a/finance/Makefile
+++ b/finance/Makefile
@@ -1,4 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2000/12/11 13:53:25 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/12 01:30:47 wiz Exp $
+#
 
     SUBDIR += emma
     SUBDIR += gnucash
diff --git a/games/Makefile b/games/Makefile
index bd369a53381..6171466cf11 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2000/12/09 18:25:41 wiz Exp $
-# FreeBSD Id: Makefile,v 1.87 1997/10/15 04:58:31 max Exp
+# $NetBSD: Makefile,v 1.106 2000/12/12 01:30:48 wiz Exp $
 #
 
     SUBDIR += abuse
diff --git a/graphics/Makefile b/graphics/Makefile
index 0c5eea88869..618d3ba44e8 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2000/12/05 00:16:55 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.53 1997/09/28 13:25:40 markm Exp
+# $NetBSD: Makefile,v 1.109 2000/12/12 01:30:48 wiz Exp $
 #
 
     SUBDIR += GMT
diff --git a/lang/Makefile b/lang/Makefile
index 7633fc9e5df..020fb8526d7 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2000/12/10 11:10:16 jtb Exp $
-# FreeBSD Id: Makefile,v 1.82 1997/09/30 07:49:24 asami Exp
+# $NetBSD: Makefile,v 1.85 2000/12/12 01:30:49 wiz Exp $
 #
 
     SUBDIR += STk
diff --git a/mail/Makefile b/mail/Makefile
index 1f42ee8e84c..8824efcaf9e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2000/12/11 02:25:35 kei Exp $
-# FreeBSD Id: Makefile,v 1.45 1997/08/13 18:35:22 andreas Exp 
+# $NetBSD: Makefile,v 1.57 2000/12/12 01:30:52 wiz Exp $
 #
 
     SUBDIR += balsa
diff --git a/math/Makefile b/math/Makefile
index 2cf6a5e698b..d6f4b34182e 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2000/12/10 05:13:49 jtb Exp $
-# FreeBSD Id: Makefile,v 1.38 1998/04/13 00:51:58 jseger Exp
+# $NetBSD: Makefile,v 1.38 2000/12/12 01:30:54 wiz Exp $
 #
 
     SUBDIR += R
diff --git a/mbone/Makefile b/mbone/Makefile
index fb2f4f35a13..8973c80f53e 100644
--- a/mbone/Makefile
+++ b/mbone/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/02/25 01:04:14 wiz Exp $
-# Id: Makefile,v 1.5 1996/12/03 10:41:49 asami Exp
+# $NetBSD: Makefile,v 1.9 2000/12/12 01:30:55 wiz Exp $
 #
 
     SUBDIR += imm
diff --git a/meta-pkgs/Makefile b/meta-pkgs/Makefile
index 09d3cce941c..949cf029367 100644
--- a/meta-pkgs/Makefile
+++ b/meta-pkgs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2000/10/24 10:16:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/12/12 01:30:57 wiz Exp $
 #
 
-SUBDIR += edesktop
-SUBDIR += netbsd-doc
-SUBDIR += netbsd-doc-print
-SUBDIR += web-server
+    SUBDIR += edesktop
+    SUBDIR += netbsd-doc
+    SUBDIR += netbsd-doc-print
+    SUBDIR += web-server
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/misc/Makefile b/misc/Makefile
index 9e8c3ad2106..3b5e405cf4f 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.69 2000/12/11 14:15:32 wiz Exp $
-# FreeBSD Id: Makefile,v 1.117 1997/10/13 04:41:07 max Exp
+# $NetBSD: Makefile,v 1.70 2000/12/12 01:30:57 wiz Exp $
+#
 
     SUBDIR += ascii
     SUBDIR += asr-manpages
diff --git a/net/Makefile b/net/Makefile
index f6bdb54d24f..b9eecd2745b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2000/12/08 16:48:23 wiz Exp $
-# FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp 
+# $NetBSD: Makefile,v 1.170 2000/12/12 01:31:02 wiz Exp $
 #
 
     SUBDIR += airportbasestationconfig
diff --git a/news/Makefile b/news/Makefile
index 3bd2e56027e..e43b06954df 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/02/25 01:04:15 wiz Exp $
-# FreeBSD Id: Makefile,v 1.28 1997/06/27 23:02:54 brian Exp 
+# $NetBSD: Makefile,v 1.17 2000/12/12 01:31:02 wiz Exp $
 #
 
     SUBDIR += inn
diff --git a/plan9/Makefile b/plan9/Makefile
index bb5ee35d825..ef58a5fdf49 100644
--- a/plan9/Makefile
+++ b/plan9/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/05/15 11:53:25 agc Exp $
-# FreeBSD Id: Makefile,v 1.3 1996/11/26 08:57:54 asami Exp
+# $NetBSD: Makefile,v 1.9 2000/12/12 01:31:03 wiz Exp $
 #
 
     SUBDIR += 9menu
diff --git a/print/Makefile b/print/Makefile
index 39992790e77..906937814c5 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2000/12/08 16:57:58 jlam Exp $
-# FreeBSD Id: Makefile,v 1.52 1997/12/14 00:58:08 asami Exp
+# $NetBSD: Makefile,v 1.48 2000/12/12 01:31:03 wiz Exp $
 #
 
     SUBDIR += LPRng
diff --git a/security/Makefile b/security/Makefile
index d4fe2b6f83c..2d2a91ecff6 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2000/11/29 11:31:55 rh Exp $
-# FreeBSD Id: Makefile,v 1.23 1997/11/09 10:17:02 asami Exp
+# $NetBSD: Makefile,v 1.53 2000/12/12 01:31:03 wiz Exp $
 #
 
     SUBDIR += PAM
diff --git a/shells/Makefile b/shells/Makefile
index 7bcbb71c0ab..e0c86387351 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/11/02 21:53:09 tron Exp $
-# FreeBSD Id: Makefile,v 1.13 1997/01/03 00:40:55 max Exp
+# $NetBSD: Makefile,v 1.8 2000/12/12 01:31:04 wiz Exp $
 #
 
     SUBDIR += bash2
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4f5b051607e..91645e1d916 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2000/12/04 13:40:47 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.23 1997/09/30 06:14:59 asami Exp
+# $NetBSD: Makefile,v 1.80 2000/12/12 01:31:04 wiz Exp $
 #
 
     SUBDIR += amanda
diff --git a/textproc/Makefile b/textproc/Makefile
index b5eb9d5d0a9..9880ceea9dd 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2000/11/10 02:29:19 wiz Exp $
-# FreeBSD Id: Makefile,v 1.13 1997/10/13 11:11:32 itojun Exp
+# $NetBSD: Makefile,v 1.64 2000/12/12 01:31:05 wiz Exp $
 #
 
     SUBDIR += antiword
diff --git a/www/Makefile b/www/Makefile
index da879ac8191..9501a9ed7b6 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2000/12/06 22:09:24 jtb Exp $
-# FreeBSD Id: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp
+# $NetBSD: Makefile,v 1.111 2000/12/12 01:31:06 wiz Exp $
 #
 
     SUBDIR += Mosaic
diff --git a/x11/Makefile b/x11/Makefile
index 79f5335c353..1ef41ce6f8e 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.189 2000/12/11 14:15:32 wiz Exp $
-# FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
+# $NetBSD: Makefile,v 1.190 2000/12/12 01:31:05 wiz Exp $
 #
 
     SUBDIR += XF86Setup