release/3.0.0

97 files changed, 100 insertions, 169 deletions

diff --git a/contrib/sendmail/BuildTools/M4/depend/BSD.m4 b/contrib/sendmail/BuildTools/M4/depend/BSD.m4
index 83827a7a7f6fe..661f69ec12ec2 100644
--- a/contrib/sendmail/BuildTools/M4/depend/BSD.m4
+++ b/contrib/sendmail/BuildTools/M4/depend/BSD.m4
@@ -1,4 +1,4 @@
-#	@(#)BSD.m4	8.3	(Berkeley)	2/9/1998
+#	@(#)BSD.m4	8.3	(Berkeley)	2/9/98
 depend: ${BEFORE}
 	@mv Makefile Makefile.old
 	@sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile
diff --git a/contrib/sendmail/BuildTools/M4/depend/CC-M.m4 b/contrib/sendmail/BuildTools/M4/depend/CC-M.m4
index 10d61b8ccebca..01d82662b1bca 100644
--- a/contrib/sendmail/BuildTools/M4/depend/CC-M.m4
+++ b/contrib/sendmail/BuildTools/M4/depend/CC-M.m4
@@ -1,4 +1,4 @@
-#	@(#)CC-M.m4	8.2	(Berkeley)	2/19/1998
+#	@(#)CC-M.m4	8.2	(Berkeley)	2/19/98
 depend: ${BEFORE}
 	@mv Makefile Makefile.old
 	@sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile
diff --git a/contrib/sendmail/BuildTools/M4/depend/NCR.m4 b/contrib/sendmail/BuildTools/M4/depend/NCR.m4
index 22af77da8b5f2..03e0c10dd387b 100644
--- a/contrib/sendmail/BuildTools/M4/depend/NCR.m4
+++ b/contrib/sendmail/BuildTools/M4/depend/NCR.m4
@@ -1,4 +1,4 @@
-#	@(#)NCR.m4	8.3	(Berkeley)	2/19/1998
+#	@(#)NCR.m4	8.3	(Berkeley)	2/19/98
 depend: ${BEFORE}
 	@mv Makefile Makefile.old
 	@sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile
diff --git a/contrib/sendmail/BuildTools/M4/depend/Solaris.m4 b/contrib/sendmail/BuildTools/M4/depend/Solaris.m4
index bf245f6fa191e..cbdc618abfc8f 100644
--- a/contrib/sendmail/BuildTools/M4/depend/Solaris.m4
+++ b/contrib/sendmail/BuildTools/M4/depend/Solaris.m4
@@ -1,4 +1,4 @@
-#	@(#)Solaris.m4	8.1	(Berkeley)	3/5/1998
+#	@(#)Solaris.m4	8.1	(Berkeley)	3/5/98
 depend: ${BEFORE}
 	@mv Makefile Makefile.old
 	@sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile
diff --git a/contrib/sendmail/BuildTools/M4/depend/X11.m4 b/contrib/sendmail/BuildTools/M4/depend/X11.m4
index 3afbfe95d821b..27f90361f4c39 100644
--- a/contrib/sendmail/BuildTools/M4/depend/X11.m4
+++ b/contrib/sendmail/BuildTools/M4/depend/X11.m4
@@ -1,4 +1,4 @@
-#	@(#)X11.m4	8.1	(Berkeley)	4/8/1998
+#	@(#)X11.m4	8.1	(Berkeley)	4/8/98
 depend: ${BEFORE}
 	makedepend -- ${COPTS} -- *.c
 
diff --git a/contrib/sendmail/BuildTools/M4/depend/generic.m4 b/contrib/sendmail/BuildTools/M4/depend/generic.m4
index 330d4cf2e0723..e7452d9e3297e 100644
--- a/contrib/sendmail/BuildTools/M4/depend/generic.m4
+++ b/contrib/sendmail/BuildTools/M4/depend/generic.m4
@@ -1,4 +1,4 @@
-#	@(#)generic.m4	8.2	(Berkeley)	2/9/1998
+#	@(#)generic.m4	8.2	(Berkeley)	2/9/98
 # dependencies
 #   gross overkill, and yet still not quite enough....
 ${OBJS}: ${SRCDIR}/sendmail.h ${SRCDIR}/conf.h
diff --git a/contrib/sendmail/BuildTools/M4/header.m4 b/contrib/sendmail/BuildTools/M4/header.m4
index 087cf0e48dced..df216bb967140 100644
--- a/contrib/sendmail/BuildTools/M4/header.m4
+++ b/contrib/sendmail/BuildTools/M4/header.m4
@@ -8,7 +8,7 @@
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	@(#)header.m4	8.14	(Berkeley)	5/19/1998
+#	@(#)header.m4	8.14	(Berkeley)	5/19/98
 #
 changecom(^A)
 undefine(`format')
diff --git a/contrib/sendmail/BuildTools/OS/386BSD b/contrib/sendmail/BuildTools/OS/386BSD
index cb6ea87a796a0..34af745c8a578 100644
--- a/contrib/sendmail/BuildTools/OS/386BSD
+++ b/contrib/sendmail/BuildTools/OS/386BSD
@@ -1,4 +1,4 @@
-#	@(#)386BSD	8.1	(Berkeley)	1/30/1998
+#	@(#)386BSD	8.1	(Berkeley)	1/30/98
 define(`confENVDEF', ` -DMIME')
 define(`confLIBS', `-lutil')
 define(`confLINKS', `/usr/sbin/sendmail /usr/bin/newaliases \
diff --git a/contrib/sendmail/BuildTools/OS/A-UX b/contrib/sendmail/BuildTools/OS/A-UX
index 3a23f367d680c..782106d7e1551 100644
--- a/contrib/sendmail/BuildTools/OS/A-UX
+++ b/contrib/sendmail/BuildTools/OS/A-UX
@@ -1,4 +1,4 @@
-#	@(#)A-UX	8.4	(Berkeley)	3/12/1998
+#	@(#)A-UX	8.4	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-D_POSIX_SOURCE ')
 define(`confLIBS', `-ldbm -lposix -lUTIL')
diff --git a/contrib/sendmail/BuildTools/OS/AIX b/contrib/sendmail/BuildTools/OS/AIX
index 03d8407a12b1c..ebf1f123262af 100644
--- a/contrib/sendmail/BuildTools/OS/AIX
+++ b/contrib/sendmail/BuildTools/OS/AIX
@@ -1,4 +1,4 @@
-#	@(#)AIX	8.6	(Berkeley)	3/12/1998
+#	@(#)AIX	8.6	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-D_AIX3 ')
 define(`confOPTIMIZE', `-g')
diff --git a/contrib/sendmail/BuildTools/OS/AIX.2 b/contrib/sendmail/BuildTools/OS/AIX.2
index 8cec811f59c19..3838e893631a4 100644
--- a/contrib/sendmail/BuildTools/OS/AIX.2
+++ b/contrib/sendmail/BuildTools/OS/AIX.2
@@ -1,4 +1,4 @@
-#	@(#)AIX.2	8.8	(Berkeley)	3/12/1998
+#	@(#)AIX.2	8.8	(Berkeley)	3/12/98
 PUSHDIVERT(1)
 SMROOT=	/usr/local/newmail
 POPDIVERT
diff --git a/contrib/sendmail/BuildTools/OS/AIX.4.2 b/contrib/sendmail/BuildTools/OS/AIX.4.2
index 3e1be252ae6ba..e302f5a113694 100644
--- a/contrib/sendmail/BuildTools/OS/AIX.4.2
+++ b/contrib/sendmail/BuildTools/OS/AIX.4.2
@@ -1,7 +1,7 @@
-#	@(#)AIX.4.2	8.6	(Berkeley)	8/6/1998
+#	@(#)AIX.4.2	8.5	(Berkeley)	3/14/98
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-D_AIX4=40200 ')
-define(`confOPTIMIZE', `-O3 -qstrict')
+define(`confOPTIMIZE', `-O3')
 define(`confLIBS', `-ldbm')
 define(`confSTDIR', `/etc')
 define(`confHFDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/AIX.4.3 b/contrib/sendmail/BuildTools/OS/AIX.4.3
index 00688c6e903a1..75a4272f04b06 100644
--- a/contrib/sendmail/BuildTools/OS/AIX.4.3
+++ b/contrib/sendmail/BuildTools/OS/AIX.4.3
@@ -1,7 +1,7 @@
-#	@(#)AIX.4.3	8.5	(Berkeley)	8/6/1998
+#	@(#)AIX.4.3	8.4	(Berkeley)	3/14/98
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-D_AIX4=40300 ')
-define(`confOPTIMIZE', `-O3 -qstrict')
+define(`confOPTIMIZE', `-O3')
 define(`confCC', `/usr/bin/xlc')
 define(`confLIBS', `-ldbm')
 define(`confSTDIR', `/etc')
diff --git a/contrib/sendmail/BuildTools/OS/AIX.4.x b/contrib/sendmail/BuildTools/OS/AIX.4.x
index a427d07860d4e..f08bfcb4a357d 100644
--- a/contrib/sendmail/BuildTools/OS/AIX.4.x
+++ b/contrib/sendmail/BuildTools/OS/AIX.4.x
@@ -1,7 +1,7 @@
-#	@(#)AIX.4.x	8.8	(Berkeley)	8/6/1998
+#	@(#)AIX.4.x	8.7	(Berkeley)	3/14/98
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-D_AIX4 ')
-define(`confOPTIMIZE', `-O3 -qstrict')
+define(`confOPTIMIZE', `-O3')
 define(`confLIBS', `-ldbm')
 define(`confSTDIR', `/etc')
 define(`confHFDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/Altos b/contrib/sendmail/BuildTools/OS/Altos
index 9865f9a14ec52..9c1f301d18d0a 100644
--- a/contrib/sendmail/BuildTools/OS/Altos
+++ b/contrib/sendmail/BuildTools/OS/Altos
@@ -1,4 +1,4 @@
-#	@(#)Altos	8.6	(Berkeley)	2/19/1998
+#	@(#)Altos	8.6	(Berkeley)	2/19/98
 define(`confCC', `gcc')
 define(`confENVDEF', `-DALTOS_SYSTEM_V ')
 define(`confLIBS', `-lsocket -lrpc')
diff --git a/contrib/sendmail/BuildTools/OS/BSD-OS b/contrib/sendmail/BuildTools/OS/BSD-OS
index 67a6243ddd01a..58586dd596f3e 100644
--- a/contrib/sendmail/BuildTools/OS/BSD-OS
+++ b/contrib/sendmail/BuildTools/OS/BSD-OS
@@ -1,4 +1,4 @@
-#	@(#)BSD-OS	8.8	(Berkeley)	6/3/1998
+#	@(#)BSD-OS	8.8	(Berkeley)	6/3/98
 define(`confMAPDEF', `-DNEWDB -DMAP_REGEX')
 define(`confENVDEF', `-DNETISO')
 define(`confLIBS', `-lutil -lkvm')
diff --git a/contrib/sendmail/BuildTools/OS/BSD43 b/contrib/sendmail/BuildTools/OS/BSD43
index 6a04bef287c38..1bbccea2c7fa9 100644
--- a/contrib/sendmail/BuildTools/OS/BSD43
+++ b/contrib/sendmail/BuildTools/OS/BSD43
@@ -1,4 +1,4 @@
-#	@(#)BSD43	8.5	(Berkeley)	3/12/1998
+#	@(#)BSD43	8.5	(Berkeley)	3/12/98
 define(`confBEFORE', `unistd.h stddef.h stdlib.h dirent.h sys/time.h')
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DoldBSD43 ')
diff --git a/contrib/sendmail/BuildTools/OS/CLIX b/contrib/sendmail/BuildTools/OS/CLIX
index 35b67a69752ed..69f422965bbd4 100644
--- a/contrib/sendmail/BuildTools/OS/CLIX
+++ b/contrib/sendmail/BuildTools/OS/CLIX
@@ -1,4 +1,4 @@
-#	@(#)CLIX	8.8	(Berkeley)	3/12/1998
+#	@(#)CLIX	8.8	(Berkeley)	3/12/98
 define(`confCC', `gcc')
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DCLIX ')
diff --git a/contrib/sendmail/BuildTools/OS/CRAYT3E.2.0.x b/contrib/sendmail/BuildTools/OS/CRAYT3E.2.0.x
index 4455e51ec816b..6f5abb5de390d 100644
--- a/contrib/sendmail/BuildTools/OS/CRAYT3E.2.0.x
+++ b/contrib/sendmail/BuildTools/OS/CRAYT3E.2.0.x
@@ -1,4 +1,4 @@
-#	@(#)CRAYT3E.2.0.x	8.1	(Berkeley)	4/21/1998
+#	@(#)CRAYT3E.2.0.x	8.1	(Berkeley)	4/21/98
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DUNICOS ')
 define(`confOPTIMIZE', `-O')
diff --git a/contrib/sendmail/BuildTools/OS/CSOS b/contrib/sendmail/BuildTools/OS/CSOS
index e39218efe8c63..3a995c9496f21 100644
--- a/contrib/sendmail/BuildTools/OS/CSOS
+++ b/contrib/sendmail/BuildTools/OS/CSOS
@@ -1,4 +1,4 @@
-#	@(#)CSOS	8.5	(Berkeley)	2/8/1998
+#	@(#)CSOS	8.5	(Berkeley)	2/8/98
 define(`confLIBS', `-lnet')
 define(`confMBINDIR', `/usr/lib')
 define(`confSBINDIR', `/usr/etc')
diff --git a/contrib/sendmail/BuildTools/OS/ConvexOS b/contrib/sendmail/BuildTools/OS/ConvexOS
index cdb81eb901c88..8ea990c6e6647 100644
--- a/contrib/sendmail/BuildTools/OS/ConvexOS
+++ b/contrib/sendmail/BuildTools/OS/ConvexOS
@@ -1,4 +1,4 @@
-#	@(#)ConvexOS	8.6	(Berkeley)	3/12/1998
+#	@(#)ConvexOS	8.6	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DYPCOMPAT -DNIS')
 define(`confENVDEF', `-D__STDC__ -d non_int_bit_field')
 define(`confOPTIMIZE', `-g')
diff --git a/contrib/sendmail/BuildTools/OS/Dell b/contrib/sendmail/BuildTools/OS/Dell
index 55fc051794658..2b9c1ea44a1ff 100644
--- a/contrib/sendmail/BuildTools/OS/Dell
+++ b/contrib/sendmail/BuildTools/OS/Dell
@@ -1,4 +1,4 @@
-#	@(#)Dell	8.8	(Berkeley)	3/12/1998
+#	@(#)Dell	8.8	(Berkeley)	3/12/98
 define(`confCC', `gcc')
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-D__svr4__ ')
diff --git a/contrib/sendmail/BuildTools/OS/DomainOS b/contrib/sendmail/BuildTools/OS/DomainOS
index 06b1e3825cac7..ee6be2726b810 100644
--- a/contrib/sendmail/BuildTools/OS/DomainOS
+++ b/contrib/sendmail/BuildTools/OS/DomainOS
@@ -1,4 +1,4 @@
-#	@(#)DomainOS	8.6	(Berkeley)	6/24/1998
+#	@(#)DomainOS	8.6	(Berkeley)	6/24/98
 define(`confCC', `cc -A nansi -A,systype,any -A,runtype,bsd4.3')
 define(`confBEFORE', `unistd.h dirent.h')
 define(`confMAPDEF', `-DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/DomainOS.10.4 b/contrib/sendmail/BuildTools/OS/DomainOS.10.4
index c8a4acf06d269..a92051b6befda 100644
--- a/contrib/sendmail/BuildTools/OS/DomainOS.10.4
+++ b/contrib/sendmail/BuildTools/OS/DomainOS.10.4
@@ -1,4 +1,4 @@
-#	@(#)DomainOS.10.4	8.1	(Berkeley)	6/24/1998
+#	@(#)DomainOS.10.4	8.1	(Berkeley)	6/24/98
 define(`confCC', `cc -A nansi -A,systype,any -A,runtype,bsd4.3')
 define(`confBEFORE', `dirent.h')
 define(`confMAPDEF', `-DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/Dynix b/contrib/sendmail/BuildTools/OS/Dynix
index 0da6fb583c232..2781e49d1c1ed 100644
--- a/contrib/sendmail/BuildTools/OS/Dynix
+++ b/contrib/sendmail/BuildTools/OS/Dynix
@@ -1,4 +1,4 @@
-#	@(#)Dynix	8.7	(Berkeley)	2/26/1998
+#	@(#)Dynix	8.7	(Berkeley)	2/26/98
 define(`confCC', `gcc')
 define(`confOPTIMIZE', `-O -g')
 define(`confLIBS', `-lseq')
diff --git a/contrib/sendmail/BuildTools/OS/EWS-UX_V b/contrib/sendmail/BuildTools/OS/EWS-UX_V
index 7875fdce7f48c..bf11275a2cd17 100644
--- a/contrib/sendmail/BuildTools/OS/EWS-UX_V
+++ b/contrib/sendmail/BuildTools/OS/EWS-UX_V
@@ -1,4 +1,4 @@
-#	@(#)EWS-UX_V	8.6	(Berkeley)	3/12/1998
+#	@(#)EWS-UX_V	8.6	(Berkeley)	3/12/98
 define(`confCC', `/usr/abiccs/bin/cc -KOlimit=900')
 define(`confBEFORE', `sysexits.h ndbm.h ndbm.o')
 define(`confMAPDEF', `-DNDBM -DNIS')
diff --git a/contrib/sendmail/BuildTools/OS/FreeBSD b/contrib/sendmail/BuildTools/OS/FreeBSD
index baede69c7d7d5..bec2c599060b2 100644
--- a/contrib/sendmail/BuildTools/OS/FreeBSD
+++ b/contrib/sendmail/BuildTools/OS/FreeBSD
@@ -1,3 +1,3 @@
-#	@(#)FreeBSD	8.5	(Berkeley)	3/12/1998
+#	@(#)FreeBSD	8.5	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
 define(`confLIBS', `-lutil')
diff --git a/contrib/sendmail/BuildTools/OS/HP-UX b/contrib/sendmail/BuildTools/OS/HP-UX
index 2ba83c9b5ddab..66d71a45eed0c 100644
--- a/contrib/sendmail/BuildTools/OS/HP-UX
+++ b/contrib/sendmail/BuildTools/OS/HP-UX
@@ -1,4 +1,4 @@
-#	@(#)HP-UX	8.9	(Berkeley)	3/14/1998
+#	@(#)HP-UX	8.9	(Berkeley)	3/14/98
 define(`confCC', `cc -Aa -D_HPUX_SOURCE')
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confOPTIMIZE', `+O1')
diff --git a/contrib/sendmail/BuildTools/OS/HP-UX.10.x b/contrib/sendmail/BuildTools/OS/HP-UX.10.x
index 5deacd0eaeab4..a4b3a816048fd 100644
--- a/contrib/sendmail/BuildTools/OS/HP-UX.10.x
+++ b/contrib/sendmail/BuildTools/OS/HP-UX.10.x
@@ -1,4 +1,4 @@
-#	@(#)HP-UX.10.x	8.10	(Berkeley)	3/21/1998
+#	@(#)HP-UX.10.x	8.10	(Berkeley)	3/21/98
 define(`confCC', `cc -Aa -D_HPUX_SOURCE')
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-DV4FS ')
diff --git a/contrib/sendmail/BuildTools/OS/HP-UX.11.x b/contrib/sendmail/BuildTools/OS/HP-UX.11.x
index 1717430a06119..9e13c58e979a8 100644
--- a/contrib/sendmail/BuildTools/OS/HP-UX.11.x
+++ b/contrib/sendmail/BuildTools/OS/HP-UX.11.x
@@ -1,4 +1,4 @@
-#	@(#)HP-UX.11.x	8.7	(Berkeley)	3/30/1998
+#	@(#)HP-UX.11.x	8.7	(Berkeley)	3/30/98
 define(`confCC', `cc -Ae')
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-DV4FS -DHPUX11 ')
diff --git a/contrib/sendmail/BuildTools/OS/IRIX b/contrib/sendmail/BuildTools/OS/IRIX
index ed5e3e23380c8..dafbda6a5fb6b 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX
+++ b/contrib/sendmail/BuildTools/OS/IRIX
@@ -1,4 +1,4 @@
-#	@(#)IRIX	8.7	(Berkeley)	3/12/1998
+#	@(#)IRIX	8.7	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-DIRIX ')
 define(`confLIBS', `-lmld -lmalloc -lsun')
diff --git a/contrib/sendmail/BuildTools/OS/IRIX.5.x b/contrib/sendmail/BuildTools/OS/IRIX.5.x
index 6d492a29c646f..4ac44c29aea1b 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX.5.x
+++ b/contrib/sendmail/BuildTools/OS/IRIX.5.x
@@ -1,4 +1,4 @@
-#	@(#)IRIX.5.x	8.7	(Berkeley)	3/12/1998
+#	@(#)IRIX.5.x	8.7	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-DIRIX5 ')
 define(`confLIBS', `-lmld -lmalloc')
diff --git a/contrib/sendmail/BuildTools/OS/IRIX.6.5 b/contrib/sendmail/BuildTools/OS/IRIX.6.5
index 1b34f2e6e6d2f..3056ff4491284 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX.6.5
+++ b/contrib/sendmail/BuildTools/OS/IRIX.6.5
@@ -1,4 +1,4 @@
-#	@(#)IRIX.6.5	8.2	(Berkeley)	4/24/1998
+#	@(#)IRIX.6.5	8.2	(Berkeley)	4/24/98
 PUSHDIVERT(1)
 # Select what ABI we are using -- see abi(5) for details
 #    -32	~ IRIX 5.3				(default: -mips2)
diff --git a/contrib/sendmail/BuildTools/OS/IRIX.6.x b/contrib/sendmail/BuildTools/OS/IRIX.6.x
index 0424933da9bd7..c52fd4ea41dc3 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX.6.x
+++ b/contrib/sendmail/BuildTools/OS/IRIX.6.x
@@ -1,4 +1,4 @@
-#	@(#)IRIX.6.x	8.11	(Berkeley)	4/24/1998
+#	@(#)IRIX.6.x	8.11	(Berkeley)	4/24/98
 PUSHDIVERT(1)
 # Select what ABI we are using -- see abi(5) for details
 #    -32	~ IRIX 5.3				(default: -mips2)
diff --git a/contrib/sendmail/BuildTools/OS/IRIX64.6.0 b/contrib/sendmail/BuildTools/OS/IRIX64.6.0
index e8b2e3a82f691..5226bb535c528 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX64.6.0
+++ b/contrib/sendmail/BuildTools/OS/IRIX64.6.0
@@ -1,4 +1,4 @@
-#	@(#)IRIX64.6.0	8.10	(Berkeley)	3/12/1998
+#	@(#)IRIX64.6.0	8.10	(Berkeley)	3/12/98
 PUSHDIVERT(1)
 # Select what ABI we are using -- see abi(5) for details
 #    -32	~ IRIX 5.3				(default: -mips2)
diff --git a/contrib/sendmail/BuildTools/OS/IRIX64.6.1 b/contrib/sendmail/BuildTools/OS/IRIX64.6.1
index 1183766b1eab3..4876a8807a478 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX64.6.1
+++ b/contrib/sendmail/BuildTools/OS/IRIX64.6.1
@@ -1,4 +1,4 @@
-#	@(#)IRIX64.6.1	8.10	(Berkeley)	3/12/1998
+#	@(#)IRIX64.6.1	8.10	(Berkeley)	3/12/98
 PUSHDIVERT(1)
 # Select what ABI we are using -- see abi(5) for details
 #    -32	~ IRIX 5.3				(default: -mips2)
diff --git a/contrib/sendmail/BuildTools/OS/IRIX64.6.5 b/contrib/sendmail/BuildTools/OS/IRIX64.6.5
deleted file mode 100644
index d0281f5c070be..0000000000000
--- a/contrib/sendmail/BuildTools/OS/IRIX64.6.5
+++ /dev/null
@@ -1,35 +0,0 @@
-#	@(#)IRIX64.6.5	8.1	(Berkeley)	11/29/1998
-PUSHDIVERT(1)
-# Select what ABI we are using -- see abi(5) for details
-#    -32	~ IRIX 5.3				(default: -mips2)
-#                 - long and pointer are 32 bit
-#    -n32        New to IRIX 6.2			(default: -mips3)
-#                 - long and pointer are 32 bit
-#    -64	~ IRIX 6.1				(default: -mips4)
-#                 - long and pointer are 64 bit
-# We force ABI here, so then it does not depend on CPU
-#
-# With IDO 6.2 (IRIX 6.2) you need subsystem compiler_dev.sw32.lib
-#	for compilation with ABI=-n32 -- alternatively you can set ABI=-32
-# ABI=-64 requires subsystem compiler_dev.sw64.lib, but this runs
-#	only with IRIX64 (ie. 64 bit kernels)
-#
-# NOTE: Do not set `confABI' in a site configuration file!  The ABI MUST 
-#	be given on the Build command line using the -E parameter, e.g.:
-#
-#		Build -E ABI=-n32
-#
-ABI=	confABI
-POPDIVERT
-define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
-define(`confENVDEF', `-DIRIX6 -DHASSNPRINTF=1 ${ABI} ')
-define(`confLDOPTS', `${ABI}')
-define(`confMBINDIR', `/usr/lib')
-define(`confSBINDIR', `/usr/etc')
-define(`confUBINDIR', `/usr/bsd')
-define(`confEBINDIR', `/usr/lib')
-define(`confSBINGRP', `sys')
-define(`confSTDIR', `/var')
-define(`confHFDIR', `/etc')
-define(`confINSTALL', `${BUILDBIN}/install.sh')
-define(`confDEPEND_TYPE', `CC-M')
diff --git a/contrib/sendmail/BuildTools/OS/IRIX64.6.x b/contrib/sendmail/BuildTools/OS/IRIX64.6.x
index f105edf8ff434..503df04b42c68 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX64.6.x
+++ b/contrib/sendmail/BuildTools/OS/IRIX64.6.x
@@ -1,4 +1,4 @@
-#	@(#)IRIX64.6.x	8.11	(Berkeley)	4/24/1998
+#	@(#)IRIX64.6.x	8.11	(Berkeley)	4/24/98
 PUSHDIVERT(1)
 # Select what ABI we are using -- see abi(5) for details
 #    -32	~ IRIX 5.3				(default: -mips2)
diff --git a/contrib/sendmail/BuildTools/OS/ISC b/contrib/sendmail/BuildTools/OS/ISC
index 58b8b78aabc38..f07093f660b08 100644
--- a/contrib/sendmail/BuildTools/OS/ISC
+++ b/contrib/sendmail/BuildTools/OS/ISC
@@ -1,4 +1,4 @@
-#	@(#)ISC	8.5	(Berkeley)	3/12/1998
+#	@(#)ISC	8.5	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-DISC_UNIX -D_POSIX_SOURCE -D_SYSV3 ')
 define(`confLIBS', `-lyp -lrpc -lndbm -linet -lcposix')
diff --git a/contrib/sendmail/BuildTools/OS/KSR b/contrib/sendmail/BuildTools/OS/KSR
index 9169cba614376..d3931a4640518 100644
--- a/contrib/sendmail/BuildTools/OS/KSR
+++ b/contrib/sendmail/BuildTools/OS/KSR
@@ -1,4 +1,4 @@
-#	@(#)KSR	8.4	(Berkeley)	3/12/1998
+#	@(#)KSR	8.4	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confLIBDIRS', `-L/usr/shlib -L/usr/lib')
 define(`confLIBS', `-ldbm')
diff --git a/contrib/sendmail/BuildTools/OS/LUNA b/contrib/sendmail/BuildTools/OS/LUNA
index e4637c9f72d11..2a0fe1d78c229 100644
--- a/contrib/sendmail/BuildTools/OS/LUNA
+++ b/contrib/sendmail/BuildTools/OS/LUNA
@@ -1,4 +1,4 @@
-#	@(#)LUNA	8.8	(Berkeley)	3/12/1998
+#	@(#)LUNA	8.8	(Berkeley)	3/12/98
 define(`confBEFORE', `dirent.h stddef.h stdlib.h unistd.h limits.h time.h sys/time.h')
 define(`confMAPDEF', `-DNDBM')
 define(`confMBINDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/Linux b/contrib/sendmail/BuildTools/OS/Linux
index 306c9efce7562..e908c478a9447 100644
--- a/contrib/sendmail/BuildTools/OS/Linux
+++ b/contrib/sendmail/BuildTools/OS/Linux
@@ -1,4 +1,4 @@
-#	@(#)Linux	8.4	(Berkeley)	3/22/1998
+#	@(#)Linux	8.4	(Berkeley)	3/22/98
 define(`confSTDIR', `/etc')
 define(`confHFDIR', `/usr/lib')
 define(`confDEPEND_TYPE', `CC-M')
diff --git a/contrib/sendmail/BuildTools/OS/Linux.ppc b/contrib/sendmail/BuildTools/OS/Linux.ppc
index e0712e3728343..d2c3cafa7ca70 100644
--- a/contrib/sendmail/BuildTools/OS/Linux.ppc
+++ b/contrib/sendmail/BuildTools/OS/Linux.ppc
@@ -1,3 +1,3 @@
-#	@(#)Linux.ppc	8.3	(Berkeley)	2/12/1998
+#	@(#)Linux.ppc	8.3	(Berkeley)	2/12/98
 define(`confHFDIR', `/usr/lib')
 define(`confSBINGRP', `mail')
diff --git a/contrib/sendmail/BuildTools/OS/Mach386 b/contrib/sendmail/BuildTools/OS/Mach386
index 7ff806e445b8b..9814781204637 100644
--- a/contrib/sendmail/BuildTools/OS/Mach386
+++ b/contrib/sendmail/BuildTools/OS/Mach386
@@ -1,4 +1,4 @@
-#	@(#)Mach386	8.6	(Berkeley)	3/12/1998
+#	@(#)Mach386	8.6	(Berkeley)	3/12/98
 define(`confCC', `gcc')
 define(`confMAPDEF', `-DNDBM')
 define(`confLIBS', `-ldbm')
diff --git a/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.2.x b/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.2.x
index bd76038a975ae..74d7334016754 100644
--- a/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.2.x
+++ b/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.2.x
@@ -1,4 +1,4 @@
-#	@(#)NCR.MP-RAS.2.x	8.9	(Berkeley)	3/12/1998
+#	@(#)NCR.MP-RAS.2.x	8.9	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DNCR_MP_RAS2 ')
 define(`confOPTIMIZE', `-O2')
diff --git a/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.3.x b/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.3.x
index 7af96677d8880..14e02e3ab05c8 100644
--- a/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.3.x
+++ b/contrib/sendmail/BuildTools/OS/NCR.MP-RAS.3.x
@@ -1,10 +1,10 @@
-#	@(#)NCR.MP-RAS.3.x	8.10	(Berkeley)	8/6/1998
+#	@(#)NCR.MP-RAS.3.x	8.9	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DNCR_MP_RAS3 ')
 define(`confOPTIMIZE', `-O2')
 define(`confINCDIRS', `-I/usr/include -I/usr/ucbinclude')
 define(`confLIBDIRS', `-L/usr/ucblib')
-define(`confLIBS', `-lresolv -lsocket -lnsl -lelf -lc -lucb')
+define(`confLIBS', `-lsocket -lnsl -lelf -lc -lucb')
 define(`confMBINDIR', `/usr/ucblib')
 define(`confSBINDIR', `/usr/ucbetc')
 define(`confUBINDIR', `/usr/ucb')
diff --git a/contrib/sendmail/BuildTools/OS/NEWS-OS.4.x b/contrib/sendmail/BuildTools/OS/NEWS-OS.4.x
index 71aa4d46b31b9..4fa83bbb7c452 100644
--- a/contrib/sendmail/BuildTools/OS/NEWS-OS.4.x
+++ b/contrib/sendmail/BuildTools/OS/NEWS-OS.4.x
@@ -1,4 +1,4 @@
-#	@(#)NEWS-OS.4.x	8.6	(Berkeley)	3/12/1998
+#	@(#)NEWS-OS.4.x	8.6	(Berkeley)	3/12/98
 define(`confBEFORE', `limits.h')
 define(`confMAPDEF', `-DNDBM')
 define(`confLIBS', `-lmld')
diff --git a/contrib/sendmail/BuildTools/OS/NEWS-OS.6.x b/contrib/sendmail/BuildTools/OS/NEWS-OS.6.x
index 4e5c809642de5..dec79b5e9ec24 100644
--- a/contrib/sendmail/BuildTools/OS/NEWS-OS.6.x
+++ b/contrib/sendmail/BuildTools/OS/NEWS-OS.6.x
@@ -1,4 +1,4 @@
-#	@(#)NEWS-OS.6.x	8.8	(Berkeley)	3/12/1998
+#	@(#)NEWS-OS.6.x	8.8	(Berkeley)	3/12/98
 define(`confCC', `/bin/cc')
 define(`confBEFORE', `sysexits.h ndbm.o')
 define(`confMAPDEF', `-DNDBM -DNIS')
diff --git a/contrib/sendmail/BuildTools/OS/NEXTSTEP.4.x b/contrib/sendmail/BuildTools/OS/NEXTSTEP.4.x
index b77581378d18b..4fd6b0386089a 100644
--- a/contrib/sendmail/BuildTools/OS/NEXTSTEP.4.x
+++ b/contrib/sendmail/BuildTools/OS/NEXTSTEP.4.x
@@ -1,4 +1,4 @@
-#	@(#)NEXTSTEP.4.x	8.1	(Berkeley)	3/21/1998
+#	@(#)NEXTSTEP.4.x	8.1	(Berkeley)	3/21/98
 PUSHDIVERT(1)
 # NEXTSTEP 3.1 and 3.2 only support m68k and i386
 #ARCH=  -arch m68k -arch i386 -arch hppa -arch sparc
diff --git a/contrib/sendmail/BuildTools/OS/NeXT.2.x b/contrib/sendmail/BuildTools/OS/NeXT.2.x
index 0a9d918318f07..d8f469495045f 100644
--- a/contrib/sendmail/BuildTools/OS/NeXT.2.x
+++ b/contrib/sendmail/BuildTools/OS/NeXT.2.x
@@ -1,4 +1,4 @@
-#	@(#)NeXT.2.x	8.7	(Berkeley)	3/12/1998
+#	@(#)NeXT.2.x	8.7	(Berkeley)	3/12/98
 define(`confBEFORE', `unistd.h dirent.h')
 define(`confMAPDEF', `-DNDBM -DNIS -DNETINFO')
 define(`confENVDEF', `-DNeXT ')
diff --git a/contrib/sendmail/BuildTools/OS/NeXT.3.x b/contrib/sendmail/BuildTools/OS/NeXT.3.x
index f5e313dd85102..05aad6f85a51e 100644
--- a/contrib/sendmail/BuildTools/OS/NeXT.3.x
+++ b/contrib/sendmail/BuildTools/OS/NeXT.3.x
@@ -1,4 +1,4 @@
-#	@(#)NeXT.3.x	8.7	(Berkeley)	3/12/1998
+#	@(#)NeXT.3.x	8.7	(Berkeley)	3/12/98
 PUSHDIVERT(1)
 # NEXTSTEP 3.1 and 3.2 only support m68k and i386
 #ARCH=  -arch m68k -arch i386 -arch hppa -arch sparc
diff --git a/contrib/sendmail/BuildTools/OS/NeXT.4.x b/contrib/sendmail/BuildTools/OS/NeXT.4.x
index 8736b74f327c6..35f3bdb35e51a 100644
--- a/contrib/sendmail/BuildTools/OS/NeXT.4.x
+++ b/contrib/sendmail/BuildTools/OS/NeXT.4.x
@@ -1,4 +1,4 @@
-#	@(#)NeXT.4.x	8.9	(Berkeley)	7/15/1998
+#	@(#)NeXT.4.x	8.8	(Berkeley)	5/25/98
 PUSHDIVERT(1)
 # NEXTSTEP 3.1 and 3.2 only support m68k and i386
 #ARCH=  -arch m68k -arch i386 -arch hppa -arch sparc
@@ -11,7 +11,7 @@ define(`confMAPDEF', `-DNDBM -DNIS -DNETINFO')
 define(`confENVDEF', `-DNeXT -Wno-precomp -pipe ${RC_CFLAGS}')
 define(`confLDOPTS', `${RC_CFLAGS}')
 define(`confLIBS', `-ldbm')
-define(`confMANROOT', `/usr/man/cat')
+define(`confMANROOT', `/usr/lib/man/cat')
 define(`confMBINDIR', `/usr/lib')
 define(`confSBINDIR', `/usr/etc')
 define(`confUBINDIR', `/usr/ucb')
diff --git a/contrib/sendmail/BuildTools/OS/NetBSD b/contrib/sendmail/BuildTools/OS/NetBSD
index cd800ef3d9531..595fd2df289d6 100644
--- a/contrib/sendmail/BuildTools/OS/NetBSD
+++ b/contrib/sendmail/BuildTools/OS/NetBSD
@@ -1,4 +1,4 @@
-#	@(#)NetBSD	8.6	(Berkeley)	3/12/1998
+#	@(#)NetBSD	8.6	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
 define(`confENVDEF', ` -DNETISO')
 define(`confDEPEND_TYPE', `CC-M')
diff --git a/contrib/sendmail/BuildTools/OS/NetBSD.8.3 b/contrib/sendmail/BuildTools/OS/NetBSD.8.3
index 714de1e6fbae6..6576660f44e8f 100644
--- a/contrib/sendmail/BuildTools/OS/NetBSD.8.3
+++ b/contrib/sendmail/BuildTools/OS/NetBSD.8.3
@@ -1,3 +1,3 @@
-#	@(#)NetBSD.8.3	8.6	(Berkeley)	3/12/1998
+#	@(#)NetBSD.8.3	8.6	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
 define(`confENVDEF', ` #  -DNETISO')
diff --git a/contrib/sendmail/BuildTools/OS/NonStop-UX b/contrib/sendmail/BuildTools/OS/NonStop-UX
index 6ccdead5e4800..02bdb7801d4d2 100644
--- a/contrib/sendmail/BuildTools/OS/NonStop-UX
+++ b/contrib/sendmail/BuildTools/OS/NonStop-UX
@@ -1,4 +1,4 @@
-#	@(#)NonStop-UX	8.8	(Berkeley)	3/12/1998
+#	@(#)NonStop-UX	8.8	(Berkeley)	3/12/98
 define(`confCC', `gcc')
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DNonStop_UX_BXX -D_SVID ')
diff --git a/contrib/sendmail/BuildTools/OS/OSF1 b/contrib/sendmail/BuildTools/OS/OSF1
index 75fecfe93c6d4..cc65dbc7844d1 100644
--- a/contrib/sendmail/BuildTools/OS/OSF1
+++ b/contrib/sendmail/BuildTools/OS/OSF1
@@ -1,4 +1,4 @@
-#	@(#)OSF1	8.7	(Berkeley)	3/14/1998
+#	@(#)OSF1	8.7	(Berkeley)	3/14/98
 define(`confCC', `cc -Olimit 1000')
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confLIBS', `-ldbm')
diff --git a/contrib/sendmail/BuildTools/OS/OpenBSD b/contrib/sendmail/BuildTools/OS/OpenBSD
index 423ab2d6463b1..fb7bc8f42c369 100644
--- a/contrib/sendmail/BuildTools/OS/OpenBSD
+++ b/contrib/sendmail/BuildTools/OS/OpenBSD
@@ -1,3 +1,3 @@
-#	@(#)OpenBSD	8.5	(Berkeley)	3/12/1998
+#	@(#)OpenBSD	8.5	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
 define(`confENVDEF', ` -DNETISO')
diff --git a/contrib/sendmail/BuildTools/OS/PTX b/contrib/sendmail/BuildTools/OS/PTX
index 7dd05eecc187b..9af372792a8ae 100644
--- a/contrib/sendmail/BuildTools/OS/PTX
+++ b/contrib/sendmail/BuildTools/OS/PTX
@@ -1,4 +1,4 @@
-#	@(#)PTX	8.6	(Berkeley)	3/12/1998
+#	@(#)PTX	8.6	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM')
 define(`confOPTIMIZE', `-g')
 define(`confLIBS', `-lsocket -linet -lelf -lnsl -lseq')
diff --git a/contrib/sendmail/BuildTools/OS/Paragon b/contrib/sendmail/BuildTools/OS/Paragon
index 868780f665312..e16e051f734a8 100644
--- a/contrib/sendmail/BuildTools/OS/Paragon
+++ b/contrib/sendmail/BuildTools/OS/Paragon
@@ -1,4 +1,4 @@
-#	@(#)Paragon	8.3	(Berkeley)	3/12/1998
+#	@(#)Paragon	8.3	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM')
 define(`confLIBDIRS', `-L/usr/shlib -L/usr/lib')
 define(`confLIBS', `-ldbm')
diff --git a/contrib/sendmail/BuildTools/OS/PowerUX b/contrib/sendmail/BuildTools/OS/PowerUX
index 47ab87c66b3d0..b0f133d0a8c7e 100644
--- a/contrib/sendmail/BuildTools/OS/PowerUX
+++ b/contrib/sendmail/BuildTools/OS/PowerUX
@@ -1,4 +1,4 @@
-#	@(#)PowerUX	8.5	(Berkeley)	2/12/1998
+#	@(#)PowerUX	8.5	(Berkeley)	2/12/98
 define(`confENVDEF', `-D__svr4__ ')
 define(`confLIBS', `-Bstatic -lsocket -lnsl -lelf -lgen')
 define(`confMBINDIR', `/usr/local/etc')
diff --git a/contrib/sendmail/BuildTools/OS/QNX b/contrib/sendmail/BuildTools/OS/QNX
index a8a67fe94cc1c..3cc01821afc88 100644
--- a/contrib/sendmail/BuildTools/OS/QNX
+++ b/contrib/sendmail/BuildTools/OS/QNX
@@ -1,4 +1,4 @@
-#	@(#)QNX	8.4	(Berkeley)	2/19/1998
+#	@(#)QNX	8.4	(Berkeley)	2/19/98
 PUSHDIVERT(1)
 #
 # For this Makefile to work you must compile and install the libdb package
diff --git a/contrib/sendmail/BuildTools/OS/RISCos b/contrib/sendmail/BuildTools/OS/RISCos
index 4b2d79ee0d061..1888ae6916161 100644
--- a/contrib/sendmail/BuildTools/OS/RISCos
+++ b/contrib/sendmail/BuildTools/OS/RISCos
@@ -1,4 +1,4 @@
-#	@(#)RISCos	8.5	(Berkeley)	3/12/1998
+#	@(#)RISCos	8.5	(Berkeley)	3/12/98
 define(`confCC', `cc -systype bsd43 -Olimit 900')
 define(`confBEFORE', `stdlib.h dirent.h unistd.h stddef.h')
 define(`confMAPDEF', `-DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/RISCos.4_0 b/contrib/sendmail/BuildTools/OS/RISCos.4_0
index 1557b8aa1fd3c..e057fb433cfe6 100644
--- a/contrib/sendmail/BuildTools/OS/RISCos.4_0
+++ b/contrib/sendmail/BuildTools/OS/RISCos.4_0
@@ -1,4 +1,4 @@
-#	@(#)RISCos.4_0	8.6	(Berkeley)	3/12/1998
+#	@(#)RISCos.4_0	8.6	(Berkeley)	3/12/98
 define(`confCC', `cc -systype bsd43 -Olimit 900')
 define(`confBEFORE', `stdlib.h dirent.h unistd.h stddef.h')
 define(`confMAPDEF', `-DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/Rhapsody b/contrib/sendmail/BuildTools/OS/Rhapsody
deleted file mode 100644
index 16cf89d80be43..0000000000000
--- a/contrib/sendmail/BuildTools/OS/Rhapsody
+++ /dev/null
@@ -1,16 +0,0 @@
-#	@(#)Rhapsody	8.1	(Berkeley)	11/7/1998
-#
-# Wilfredo Sanchez <wsanchez@apple.com>:
-#    We look a lot more like 4.4BSD than NeXTStep or OpenStep.
-#
-define(`confMAPDEF',   `-DNEWDB -DNIS -DMAP_REGEX -DNETINFO -DAUTO_NETINFO_ALIASES -DAUTO_NETINFO_HOSTS')
-define(`confENVDEF',   `-DNETISO -traditional-cpp -pipe ${Extra_CC_Flags}')
-define(`confLDOPTS',   `${Extra_LD_Flags}')
-define(`confOPTIMIZE', `-O3')
-define(`confHFDIR',    `/usr/share/sendmail')
-define(`confMANOWN',   `root')
-define(`confMANGRP',   `wheel')
-define(`confUBINOWN',  `root')
-define(`confUBINGRP',  `wheel')
-define(`confSBINOWN',  `root')
-define(`confSBINGRP',  `wheel')
diff --git a/contrib/sendmail/BuildTools/OS/SCO b/contrib/sendmail/BuildTools/OS/SCO
index e995052e225df..a72ba53eebe4a 100644
--- a/contrib/sendmail/BuildTools/OS/SCO
+++ b/contrib/sendmail/BuildTools/OS/SCO
@@ -1,4 +1,4 @@
-#	@(#)SCO	8.3	(Berkeley)	2/8/1998
+#	@(#)SCO	8.3	(Berkeley)	2/8/98
 define(`confENVDEF', `-D_SCO_unix_ ')
 define(`confLIBS', `-lsocket -lprot_s -lx -lc_s')
 define(`confMBINDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/SCO.4.2 b/contrib/sendmail/BuildTools/OS/SCO.4.2
index 0d458befa3a14..027f7300667ae 100644
--- a/contrib/sendmail/BuildTools/OS/SCO.4.2
+++ b/contrib/sendmail/BuildTools/OS/SCO.4.2
@@ -1,4 +1,4 @@
-#	@(#)SCO.4.2	8.5	(Berkeley)	6/30/1998
+#	@(#)SCO.4.2	8.5	(Berkeley)	6/30/98
 define(`confENVDEF', `-D_SCO_unix_4_2 ')
 define(`confLIBS', `-lsocket -lndbm -lprot_s -lx -lc_s')
 define(`confMAPDEF', `-DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/SCO.5.x b/contrib/sendmail/BuildTools/OS/SCO.5.x
index d7fdc736e68a4..8f095ac5aed31 100644
--- a/contrib/sendmail/BuildTools/OS/SCO.5.x
+++ b/contrib/sendmail/BuildTools/OS/SCO.5.x
@@ -1,4 +1,4 @@
-#	@(#)SCO.5.x	8.10	(Berkeley)	6/30/1998
+#	@(#)SCO.5.x	8.10	(Berkeley)	6/30/98
 define(`confCC', `cc -b elf')
 define(`confLIBS', `-lsocket -lndbm -lprot -lcurses -lm -lx -lgen')
 define(`confMAPDEF', `-DMAP_REGEX -DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/SINIX b/contrib/sendmail/BuildTools/OS/SINIX
index 3c27937af9379..93cc78135012d 100644
--- a/contrib/sendmail/BuildTools/OS/SINIX
+++ b/contrib/sendmail/BuildTools/OS/SINIX
@@ -1,4 +1,4 @@
-#	@(#)SINIX	8.5	(Berkeley)	2/12/1998
+#	@(#)SINIX	8.5	(Berkeley)	2/12/98
 define(`confCC', `/usr/bin/cc')
 define(`confENVDEF', `-D__svr4__ ')
 define(`confLIBS', `-lsocket -lnsl -lelf')
diff --git a/contrib/sendmail/BuildTools/OS/SVR4 b/contrib/sendmail/BuildTools/OS/SVR4
index 92cf10101202d..f342c3feeb3ea 100644
--- a/contrib/sendmail/BuildTools/OS/SVR4
+++ b/contrib/sendmail/BuildTools/OS/SVR4
@@ -1,4 +1,4 @@
-#	@(#)SVR4	8.6	(Berkeley)	3/12/1998
+#	@(#)SVR4	8.6	(Berkeley)	3/12/98
 define(`confCC', `gcc')
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-D__svr4__ ')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS b/contrib/sendmail/BuildTools/OS/SunOS
index 9db95698a4b2a..2a8897825acf1 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS
+++ b/contrib/sendmail/BuildTools/OS/SunOS
@@ -1,4 +1,4 @@
-#	@(#)SunOS	8.6	(Berkeley)	3/12/1998
+#	@(#)SunOS	8.6	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confLDOPTS', `-Bstatic')
 define(`confMBINDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.4.0 b/contrib/sendmail/BuildTools/OS/SunOS.4.0
index 0bcbc5f577549..05bbc57d5049c 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.4.0
+++ b/contrib/sendmail/BuildTools/OS/SunOS.4.0
@@ -1,4 +1,4 @@
-#	@(#)SunOS.4.0	8.6	(Berkeley)	3/12/1998
+#	@(#)SunOS.4.0	8.6	(Berkeley)	3/12/98
 define(`confBEFORE', `stdlib.h stddef.h limits.h')
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-DSUNOS403 ')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.1 b/contrib/sendmail/BuildTools/OS/SunOS.5.1
index fe39bb9c3a73e..2383609ef14a7 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.1
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.1
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.1	8.8	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.1	8.8	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.2 b/contrib/sendmail/BuildTools/OS/SunOS.5.2
index 80bc0870ae1dd..5e635db694e28 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.2
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.2
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.2	8.8	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.2	8.8	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.3 b/contrib/sendmail/BuildTools/OS/SunOS.5.3
index dcee93ec33de3..8f64d219b7be3 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.3
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.3
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.3	8.8	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.3	8.8	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.4 b/contrib/sendmail/BuildTools/OS/SunOS.5.4
index 4a6b880a31385..65e84002c7b7f 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.4
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.4
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.4	8.10	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.4	8.10	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.5 b/contrib/sendmail/BuildTools/OS/SunOS.5.5
index 64264d7deb248..267f16d22a1b5 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.5
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.5
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.5	8.11	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.5	8.11	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.6 b/contrib/sendmail/BuildTools/OS/SunOS.5.6
index da17de8ed32dc..0537007008d1c 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.6
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.6
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.6	8.10	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.6	8.10	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
diff --git a/contrib/sendmail/BuildTools/OS/SunOS.5.7 b/contrib/sendmail/BuildTools/OS/SunOS.5.7
index 962095dbbcbe0..b030e77c65062 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS.5.7
+++ b/contrib/sendmail/BuildTools/OS/SunOS.5.7
@@ -1,4 +1,4 @@
-#	@(#)SunOS.5.7	8.11	(Berkeley)	3/21/1998
+#	@(#)SunOS.5.7	8.11	(Berkeley)	3/21/98
 define(`confCC', `gcc')
 define(`confBEFORE', `sysexits.h')
 define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
diff --git a/contrib/sendmail/BuildTools/OS/Titan b/contrib/sendmail/BuildTools/OS/Titan
index 938b46df369c1..b66820089fd1c 100644
--- a/contrib/sendmail/BuildTools/OS/Titan
+++ b/contrib/sendmail/BuildTools/OS/Titan
@@ -1,4 +1,4 @@
-#	@(#)Titan	8.5	(Berkeley)	3/12/1998
+#	@(#)Titan	8.5	(Berkeley)	3/12/98
 define(`confCC', `cc -43')
 define(`confBEFORE', `stddef.h stdlib.h')
 define(`confMAPDEF', `-DNDBM')
diff --git a/contrib/sendmail/BuildTools/OS/ULTRIX b/contrib/sendmail/BuildTools/OS/ULTRIX
index e9073f97a56ab..f5df633e52ef9 100644
--- a/contrib/sendmail/BuildTools/OS/ULTRIX
+++ b/contrib/sendmail/BuildTools/OS/ULTRIX
@@ -1,5 +1,5 @@
-#	@(#)ULTRIX	8.8	(Berkeley)	12/18/1998
-define(`confCC', `cc -Olimit 970')
+#	@(#)ULTRIX	8.7	(Berkeley)	3/12/98
+define(`confCC', `cc -Olimit 950')
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-DIDENTPROTO=0 ')
 define(`confMBINDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/UMAX b/contrib/sendmail/BuildTools/OS/UMAX
index 078b827a8499a..450c91da75009 100644
--- a/contrib/sendmail/BuildTools/OS/UMAX
+++ b/contrib/sendmail/BuildTools/OS/UMAX
@@ -1,4 +1,4 @@
-#	@(#)UMAX	8.5	(Berkeley)	3/12/1998
+#	@(#)UMAX	8.5	(Berkeley)	3/12/98
 define(`confBEFORE', `stddef.h')
 define(`confMAPDEF', `-DNIS')
 define(`confENVDEF', `-DUMAXV ')
diff --git a/contrib/sendmail/BuildTools/OS/UNICOS b/contrib/sendmail/BuildTools/OS/UNICOS
index 3b05dc059b9d8..7984fa927c954 100644
--- a/contrib/sendmail/BuildTools/OS/UNICOS
+++ b/contrib/sendmail/BuildTools/OS/UNICOS
@@ -1,4 +1,4 @@
-#	@(#)UNICOS	8.7	(Berkeley)	2/26/1998
+#	@(#)UNICOS	8.7	(Berkeley)	2/26/98
 define(`confENVDEF', `-DUNICOS ')
 define(`confOPTIMIZE', `-O')
 define(`confMBINDIR', `/usr/lib')
diff --git a/contrib/sendmail/BuildTools/OS/UNIX_SV.4.x.i386 b/contrib/sendmail/BuildTools/OS/UNIX_SV.4.x.i386
index b0e27537714d3..a6865e786aedc 100644
--- a/contrib/sendmail/BuildTools/OS/UNIX_SV.4.x.i386
+++ b/contrib/sendmail/BuildTools/OS/UNIX_SV.4.x.i386
@@ -1,4 +1,4 @@
-#	@(#)UNIX_SV.4.x.i386	8.6	(Berkeley)	3/12/1998
+#	@(#)UNIX_SV.4.x.i386	8.6	(Berkeley)	3/12/98
 define(`confCC', `gcc')
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-D__svr4__ -DUNIXWARE ')
diff --git a/contrib/sendmail/BuildTools/OS/UX4800 b/contrib/sendmail/BuildTools/OS/UX4800
index 7c1822ae70547..207b370baa0ce 100644
--- a/contrib/sendmail/BuildTools/OS/UX4800
+++ b/contrib/sendmail/BuildTools/OS/UX4800
@@ -1,4 +1,4 @@
-#	@(#)UX4800	8.8	(Berkeley)	3/12/1998
+#	@(#)UX4800	8.8	(Berkeley)	3/12/98
 define(`confCC', `/usr/abiccs/bin/cc -KOlimit=900')
 define(`confBEFORE', `sysexits.h ndbm.h')
 define(`confMAPDEF', `-DNDBM -DNIS		# without NEWDB')
diff --git a/contrib/sendmail/BuildTools/OS/UXPDS.V10 b/contrib/sendmail/BuildTools/OS/UXPDS.V10
index 438d88d1c8bf5..bf30140343782 100644
--- a/contrib/sendmail/BuildTools/OS/UXPDS.V10
+++ b/contrib/sendmail/BuildTools/OS/UXPDS.V10
@@ -1,4 +1,4 @@
-#	@(#)UXPDS.V10	8.9	(Berkeley)	3/12/1998
+#	@(#)UXPDS.V10	8.9	(Berkeley)	3/12/98
 define(`confCC', `/usr/ccs/bin/cc')
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confENVDEF', `-DUXPDS=10 ')
diff --git a/contrib/sendmail/BuildTools/OS/UXPDS.V20 b/contrib/sendmail/BuildTools/OS/UXPDS.V20
index f2d0b37bbcf6e..cacdb4af68b3e 100644
--- a/contrib/sendmail/BuildTools/OS/UXPDS.V20
+++ b/contrib/sendmail/BuildTools/OS/UXPDS.V20
@@ -1,4 +1,4 @@
-#	@(#)UXPDS.V20	8.8	(Berkeley)	3/12/1998
+#	@(#)UXPDS.V20	8.8	(Berkeley)	3/12/98
 define(`confCC', `/usr/ccs/bin/cc')
 define(`confBEFORE', `netinet/ip_var.h')
 define(`confMAPDEF', `-DNDBM -DNIS')
diff --git a/contrib/sendmail/BuildTools/OS/UnixWare.5.i386 b/contrib/sendmail/BuildTools/OS/UnixWare.5.i386
deleted file mode 100644
index 77ca82da0a26c..0000000000000
--- a/contrib/sendmail/BuildTools/OS/UnixWare.5.i386
+++ /dev/null
@@ -1,18 +0,0 @@
-#	@(#)UnixWare.5.i386	8.2	(Berkeley)	10/15/1998
-#
-# System V Rel 5.x (a.k.a Unixware7 w/o BSD-Compatiblity Libs ie. native)
-#	Contributed by Paul Gampe <paulg@apnic.net>
-#
-define(`confCC', `/usr/ccs/bin/cc')
-define(`confMAPDEF', `-DNDBM -DMAP_REGEX')
-define(`confENVDEF', `-D__svr5__')
-define(`confLIBS', `-lsocket -lnsl -lelf')
-define(`confSHELL', `/usr/bin/sh')
-define(`confMBINDIR', `/usr/lib')
-define(`confSBINDIR', `/etc/mail')
-define(`confUBINDIR', `/etc/mail')
-define(`confEBINDIR', `/usr/lib')
-define(`confSBINGRP', `mail')
-define(`confSTDIR', `/etc/mail')
-define(`confHFDIR', `/etc/mail')
-define(`confINSTALL', `/usr/ucb/install')
diff --git a/contrib/sendmail/BuildTools/OS/dcosx.1.x.NILE b/contrib/sendmail/BuildTools/OS/dcosx.1.x.NILE
index 095de367dad88..900afcd632b9e 100644
--- a/contrib/sendmail/BuildTools/OS/dcosx.1.x.NILE
+++ b/contrib/sendmail/BuildTools/OS/dcosx.1.x.NILE
@@ -1,4 +1,4 @@
-#	@(#)dcosx.1.x.NILE	8.3	(Berkeley)	2/8/1998
+#	@(#)dcosx.1.x.NILE	8.3	(Berkeley)	2/8/98
 define(`confENVDEF', `-D__svr4__ -DDCOSx ')
 define(`confLIBS', `-lsocket -lnsl -lelf')
 define(`confHFDIR', `/usr/share/lib/mail')
diff --git a/contrib/sendmail/BuildTools/OS/dgux b/contrib/sendmail/BuildTools/OS/dgux
index 66132c091b0f4..7d6d867b1ec17 100644
--- a/contrib/sendmail/BuildTools/OS/dgux
+++ b/contrib/sendmail/BuildTools/OS/dgux
@@ -1,4 +1,4 @@
-#	@(#)dgux	8.5	(Berkeley)	3/12/1998
+#	@(#)dgux	8.5	(Berkeley)	3/12/98
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confLIBS', `-ldbm')
 define(`confMBINDIR', `/usr/bin')
diff --git a/contrib/sendmail/BuildTools/OS/maxion b/contrib/sendmail/BuildTools/OS/maxion
index 0177911dfe136..3bb6e0e2e2cdb 100644
--- a/contrib/sendmail/BuildTools/OS/maxion
+++ b/contrib/sendmail/BuildTools/OS/maxion
@@ -1,4 +1,4 @@
-#	@(#)maxion	8.6	(Berkeley)	3/12/1998
+#	@(#)maxion	8.6	(Berkeley)	3/12/98
 define(`confCC', `/usr/ucb/cc')
 define(`confMAPDEF', `-DNDBM -DNIS')
 define(`confLIBDIRS', `-L/usr/ucblib')
diff --git a/contrib/sendmail/BuildTools/OS/uts.systemV b/contrib/sendmail/BuildTools/OS/uts.systemV
index acee532530f5d..c5f841fb5ab04 100644
--- a/contrib/sendmail/BuildTools/OS/uts.systemV
+++ b/contrib/sendmail/BuildTools/OS/uts.systemV
@@ -1,4 +1,4 @@
-#	@(#)uts.systemV	8.10	(Berkeley)	3/12/1998
+#	@(#)uts.systemV	8.10	(Berkeley)	3/12/98
 PUSHDIVERT(1)
 #  Sendmail 8 on UTS requires BIND 4.9's include files and lib44bsd and
 #  libresolv libraries.  The BIND version on UTS is much too old.
diff --git a/contrib/sendmail/BuildTools/README b/contrib/sendmail/BuildTools/README
index 65726165c7333..0efc1548b391f 100644
--- a/contrib/sendmail/BuildTools/README
+++ b/contrib/sendmail/BuildTools/README
@@ -107,4 +107,4 @@ confUBINGRP	    bin			The group for user-executable binaries.
 confUBINMODE	    555			The mode for user-executable binaries.
 
 
-@(#)README	8.22 (Berkeley) 6/30/1998
+@(#)README	8.22 (Berkeley) 6/30/98
diff --git a/contrib/sendmail/BuildTools/Site/README b/contrib/sendmail/BuildTools/Site/README
index 44e14e886aadb..d5ecb96001dca 100644
--- a/contrib/sendmail/BuildTools/Site/README
+++ b/contrib/sendmail/BuildTools/Site/README
@@ -13,4 +13,4 @@ directory.
 
 See the README in the BuildTools directory for more information.
 
-@(#)README	8.3 (Berkeley) 3/27/1998
+@(#)README	8.3 (Berkeley) 3/27/98
diff --git a/contrib/sendmail/BuildTools/bin/Build b/contrib/sendmail/BuildTools/bin/Build
index bca061f54667b..ab8a49d78cac9 100755
--- a/contrib/sendmail/BuildTools/bin/Build
+++ b/contrib/sendmail/BuildTools/bin/Build
@@ -10,7 +10,7 @@
 # the sendmail distribution.
 #
 #
-#       @(#)Build	8.93 (Berkeley) 6/24/1998
+#       @(#)Build	8.93 (Berkeley) 6/24/98
 #
 
 #
diff --git a/contrib/sendmail/BuildTools/bin/configure.sh b/contrib/sendmail/BuildTools/bin/configure.sh
index aff771c8127af..eb149b2cdd469 100644
--- a/contrib/sendmail/BuildTools/bin/configure.sh
+++ b/contrib/sendmail/BuildTools/bin/configure.sh
@@ -7,7 +7,7 @@
 # the sendmail distribution.
 #
 #
-#	@(#)configure.sh	8.27 (Berkeley) 5/19/1998
+#	@(#)configure.sh	8.27 (Berkeley) 5/19/98
 
 #
 #  Special script to autoconfigure for M4 generation of Makefile
diff --git a/contrib/sendmail/BuildTools/bin/find_m4.sh b/contrib/sendmail/BuildTools/bin/find_m4.sh
index 632e86f0467a4..d2cf66556d822 100755
--- a/contrib/sendmail/BuildTools/bin/find_m4.sh
+++ b/contrib/sendmail/BuildTools/bin/find_m4.sh
@@ -7,7 +7,7 @@
 # the sendmail distribution.
 #
 #
-#       @(#)find_m4.sh	8.4 (Berkeley) 5/19/1998
+#       @(#)find_m4.sh	8.4 (Berkeley) 5/19/98
 #
 
 # Try to find a working M4 program.
diff --git a/contrib/sendmail/BuildTools/bin/install.sh b/contrib/sendmail/BuildTools/bin/install.sh
index 840aa3385ff9c..58f7623a1475e 100755
--- a/contrib/sendmail/BuildTools/bin/install.sh
+++ b/contrib/sendmail/BuildTools/bin/install.sh
@@ -7,7 +7,7 @@
 # the sendmail distribution.
 #
 #
-#	@(#)install.sh	8.9 (Berkeley) 5/19/1998
+#	@(#)install.sh	8.9 (Berkeley) 5/19/98
 
 # Set default program
 program=mv