This commit was generated by cvs2svn to compensate for changes in r42575,

which included commits to RCS files with non-trunk default branches.

84 files changed, 156 insertions, 87 deletions

diff --git a/contrib/sendmail/BuildTools/OS/386BSD b/contrib/sendmail/BuildTools/OS/386BSD
index 34af745..cb6ea87 100644
--- a/contrib/sendmail/BuildTools/OS/386BSD
+++ b/contrib/sendmail/BuildTools/OS/386BSD
@@ -1,4 +1,4 @@
-#	@(#)386BSD	8.1	(Berkeley)	1/30/98
+#	@(#)386BSD	8.1	(Berkeley)	1/30/1998
 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 782106d..3a23f36 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/98
+#	@(#)A-UX	8.4	(Berkeley)	3/12/1998
 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 ebf1f12..03d8407 100644
--- a/contrib/sendmail/BuildTools/OS/AIX
+++ b/contrib/sendmail/BuildTools/OS/AIX
@@ -1,4 +1,4 @@
-#	@(#)AIX	8.6	(Berkeley)	3/12/98
+#	@(#)AIX	8.6	(Berkeley)	3/12/1998
 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 3838e89..8cec811 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/98
+#	@(#)AIX.2	8.8	(Berkeley)	3/12/1998
 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 e302f5a..3e1be25 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.5	(Berkeley)	3/14/98
+#	@(#)AIX.4.2	8.6	(Berkeley)	8/6/1998
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-D_AIX4=40200 ')
-define(`confOPTIMIZE', `-O3')
+define(`confOPTIMIZE', `-O3 -qstrict')
 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 75a4272..00688c6 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.4	(Berkeley)	3/14/98
+#	@(#)AIX.4.3	8.5	(Berkeley)	8/6/1998
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-D_AIX4=40300 ')
-define(`confOPTIMIZE', `-O3')
+define(`confOPTIMIZE', `-O3 -qstrict')
 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 f08bfcb..a427d07 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.7	(Berkeley)	3/14/98
+#	@(#)AIX.4.x	8.8	(Berkeley)	8/6/1998
 define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-D_AIX4 ')
-define(`confOPTIMIZE', `-O3')
+define(`confOPTIMIZE', `-O3 -qstrict')
 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 9c1f301..9865f9a 100644
--- a/contrib/sendmail/BuildTools/OS/Altos
+++ b/contrib/sendmail/BuildTools/OS/Altos
@@ -1,4 +1,4 @@
-#	@(#)Altos	8.6	(Berkeley)	2/19/98
+#	@(#)Altos	8.6	(Berkeley)	2/19/1998
 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 58586dd..67a6243 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/98
+#	@(#)BSD-OS	8.8	(Berkeley)	6/3/1998
 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 1bbccea..6a04bef 100644
--- a/contrib/sendmail/BuildTools/OS/BSD43
+++ b/contrib/sendmail/BuildTools/OS/BSD43
@@ -1,4 +1,4 @@
-#	@(#)BSD43	8.5	(Berkeley)	3/12/98
+#	@(#)BSD43	8.5	(Berkeley)	3/12/1998
 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 69f4229..35b67a6 100644
--- a/contrib/sendmail/BuildTools/OS/CLIX
+++ b/contrib/sendmail/BuildTools/OS/CLIX
@@ -1,4 +1,4 @@
-#	@(#)CLIX	8.8	(Berkeley)	3/12/98
+#	@(#)CLIX	8.8	(Berkeley)	3/12/1998
 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 6f5abb5..4455e51 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/98
+#	@(#)CRAYT3E.2.0.x	8.1	(Berkeley)	4/21/1998
 define(`confMAPDEF', `-DNDBM')
 define(`confENVDEF', `-DUNICOS ')
 define(`confOPTIMIZE', `-O')
diff --git a/contrib/sendmail/BuildTools/OS/CSOS b/contrib/sendmail/BuildTools/OS/CSOS
index 3a995c9..e39218e 100644
--- a/contrib/sendmail/BuildTools/OS/CSOS
+++ b/contrib/sendmail/BuildTools/OS/CSOS
@@ -1,4 +1,4 @@
-#	@(#)CSOS	8.5	(Berkeley)	2/8/98
+#	@(#)CSOS	8.5	(Berkeley)	2/8/1998
 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 8ea990c..cdb81eb 100644
--- a/contrib/sendmail/BuildTools/OS/ConvexOS
+++ b/contrib/sendmail/BuildTools/OS/ConvexOS
@@ -1,4 +1,4 @@
-#	@(#)ConvexOS	8.6	(Berkeley)	3/12/98
+#	@(#)ConvexOS	8.6	(Berkeley)	3/12/1998
 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 2b9c1ea..55fc051 100644
--- a/contrib/sendmail/BuildTools/OS/Dell
+++ b/contrib/sendmail/BuildTools/OS/Dell
@@ -1,4 +1,4 @@
-#	@(#)Dell	8.8	(Berkeley)	3/12/98
+#	@(#)Dell	8.8	(Berkeley)	3/12/1998
 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 ee6be27..06b1e38 100644
--- a/contrib/sendmail/BuildTools/OS/DomainOS
+++ b/contrib/sendmail/BuildTools/OS/DomainOS
@@ -1,4 +1,4 @@
-#	@(#)DomainOS	8.6	(Berkeley)	6/24/98
+#	@(#)DomainOS	8.6	(Berkeley)	6/24/1998
 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 a92051b..c8a4acf 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/98
+#	@(#)DomainOS.10.4	8.1	(Berkeley)	6/24/1998
 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 2781e49..0da6fb5 100644
--- a/contrib/sendmail/BuildTools/OS/Dynix
+++ b/contrib/sendmail/BuildTools/OS/Dynix
@@ -1,4 +1,4 @@
-#	@(#)Dynix	8.7	(Berkeley)	2/26/98
+#	@(#)Dynix	8.7	(Berkeley)	2/26/1998
 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 bf11275..7875fdc 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/98
+#	@(#)EWS-UX_V	8.6	(Berkeley)	3/12/1998
 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 bec2c59..baede69 100644
--- a/contrib/sendmail/BuildTools/OS/FreeBSD
+++ b/contrib/sendmail/BuildTools/OS/FreeBSD
@@ -1,3 +1,3 @@
-#	@(#)FreeBSD	8.5	(Berkeley)	3/12/98
+#	@(#)FreeBSD	8.5	(Berkeley)	3/12/1998
 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 66d71a4..2ba83c9 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/98
+#	@(#)HP-UX	8.9	(Berkeley)	3/14/1998
 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 a4b3a81..5deacd0 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/98
+#	@(#)HP-UX.10.x	8.10	(Berkeley)	3/21/1998
 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 9e13c58..1717430 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/98
+#	@(#)HP-UX.11.x	8.7	(Berkeley)	3/30/1998
 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 dafbda6..ed5e3e2 100644
--- a/contrib/sendmail/BuildTools/OS/IRIX
+++ b/contrib/sendmail/BuildTools/OS/IRIX
@@ -1,4 +1,4 @@
-#	@(#)IRIX	8.7	(Berkeley)	3/12/98
+#	@(#)IRIX	8.7	(Berkeley)	3/12/1998
 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 4ac44c2..6d492a2 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/98
+#	@(#)IRIX.5.x	8.7	(Berkeley)	3/12/1998
 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 3056ff4..1b34f2e 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/98
+#	@(#)IRIX.6.5	8.2	(Berkeley)	4/24/1998
 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 c52fd4e..0424933 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/98
+#	@(#)IRIX.6.x	8.11	(Berkeley)	4/24/1998
 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 5226bb5..e8b2e3a 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/98
+#	@(#)IRIX64.6.0	8.10	(Berkeley)	3/12/1998
 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 4876a88..1183766 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/98
+#	@(#)IRIX64.6.1	8.10	(Berkeley)	3/12/1998
 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
new file mode 100644
index 0000000..d0281f5
--- /dev/null
+++ b/contrib/sendmail/BuildTools/OS/IRIX64.6.5
@@ -0,0 +1,35 @@
+#	@(#)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 503df04..f105edf 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/98
+#	@(#)IRIX64.6.x	8.11	(Berkeley)	4/24/1998
 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 f07093f..58b8b78 100644
--- a/contrib/sendmail/BuildTools/OS/ISC
+++ b/contrib/sendmail/BuildTools/OS/ISC
@@ -1,4 +1,4 @@
-#	@(#)ISC	8.5	(Berkeley)	3/12/98
+#	@(#)ISC	8.5	(Berkeley)	3/12/1998
 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 d3931a4..9169cba 100644
--- a/contrib/sendmail/BuildTools/OS/KSR
+++ b/contrib/sendmail/BuildTools/OS/KSR
@@ -1,4 +1,4 @@
-#	@(#)KSR	8.4	(Berkeley)	3/12/98
+#	@(#)KSR	8.4	(Berkeley)	3/12/1998
 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 2a0fe1d..e4637c9 100644
--- a/contrib/sendmail/BuildTools/OS/LUNA
+++ b/contrib/sendmail/BuildTools/OS/LUNA
@@ -1,4 +1,4 @@
-#	@(#)LUNA	8.8	(Berkeley)	3/12/98
+#	@(#)LUNA	8.8	(Berkeley)	3/12/1998
 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 e908c47..306c9ef 100644
--- a/contrib/sendmail/BuildTools/OS/Linux
+++ b/contrib/sendmail/BuildTools/OS/Linux
@@ -1,4 +1,4 @@
-#	@(#)Linux	8.4	(Berkeley)	3/22/98
+#	@(#)Linux	8.4	(Berkeley)	3/22/1998
 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 d2c3caf..e0712e3 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/98
+#	@(#)Linux.ppc	8.3	(Berkeley)	2/12/1998
 define(`confHFDIR', `/usr/lib')
 define(`confSBINGRP', `mail')
diff --git a/contrib/sendmail/BuildTools/OS/Mach386 b/contrib/sendmail/BuildTools/OS/Mach386
index 9814781..7ff806e 100644
--- a/contrib/sendmail/BuildTools/OS/Mach386
+++ b/contrib/sendmail/BuildTools/OS/Mach386
@@ -1,4 +1,4 @@
-#	@(#)Mach386	8.6	(Berkeley)	3/12/98
+#	@(#)Mach386	8.6	(Berkeley)	3/12/1998
 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 74d7334..bd76038 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/98
+#	@(#)NCR.MP-RAS.2.x	8.9	(Berkeley)	3/12/1998
 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 14e02e3..7af9667 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.9	(Berkeley)	3/12/98
+#	@(#)NCR.MP-RAS.3.x	8.10	(Berkeley)	8/6/1998
 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', `-lsocket -lnsl -lelf -lc -lucb')
+define(`confLIBS', `-lresolv -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 4fa83bb..71aa4d4 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/98
+#	@(#)NEWS-OS.4.x	8.6	(Berkeley)	3/12/1998
 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 dec79b5..4e5c809 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/98
+#	@(#)NEWS-OS.6.x	8.8	(Berkeley)	3/12/1998
 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 4fd6b03..b775813 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/98
+#	@(#)NEXTSTEP.4.x	8.1	(Berkeley)	3/21/1998
 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 d8f4694..0a9d918 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/98
+#	@(#)NeXT.2.x	8.7	(Berkeley)	3/12/1998
 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 05aad6f..f5e313d 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/98
+#	@(#)NeXT.3.x	8.7	(Berkeley)	3/12/1998
 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 35f3bdb..8736b74 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.8	(Berkeley)	5/25/98
+#	@(#)NeXT.4.x	8.9	(Berkeley)	7/15/1998
 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/lib/man/cat')
+define(`confMANROOT', `/usr/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 595fd2d..cd800ef 100644
--- a/contrib/sendmail/BuildTools/OS/NetBSD
+++ b/contrib/sendmail/BuildTools/OS/NetBSD
@@ -1,4 +1,4 @@
-#	@(#)NetBSD	8.6	(Berkeley)	3/12/98
+#	@(#)NetBSD	8.6	(Berkeley)	3/12/1998
 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 6576660..714de1e 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/98
+#	@(#)NetBSD.8.3	8.6	(Berkeley)	3/12/1998
 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 02bdb78..6ccdead 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/98
+#	@(#)NonStop-UX	8.8	(Berkeley)	3/12/1998
 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 cc65dbc..75fecfe 100644
--- a/contrib/sendmail/BuildTools/OS/OSF1
+++ b/contrib/sendmail/BuildTools/OS/OSF1
@@ -1,4 +1,4 @@
-#	@(#)OSF1	8.7	(Berkeley)	3/14/98
+#	@(#)OSF1	8.7	(Berkeley)	3/14/1998
 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 fb7bc8f..423ab2d 100644
--- a/contrib/sendmail/BuildTools/OS/OpenBSD
+++ b/contrib/sendmail/BuildTools/OS/OpenBSD
@@ -1,3 +1,3 @@
-#	@(#)OpenBSD	8.5	(Berkeley)	3/12/98
+#	@(#)OpenBSD	8.5	(Berkeley)	3/12/1998
 define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
 define(`confENVDEF', ` -DNETISO')
diff --git a/contrib/sendmail/BuildTools/OS/PTX b/contrib/sendmail/BuildTools/OS/PTX
index 9af3727..7dd05ee 100644
--- a/contrib/sendmail/BuildTools/OS/PTX
+++ b/contrib/sendmail/BuildTools/OS/PTX
@@ -1,4 +1,4 @@
-#	@(#)PTX	8.6	(Berkeley)	3/12/98
+#	@(#)PTX	8.6	(Berkeley)	3/12/1998
 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 e16e051..868780f 100644
--- a/contrib/sendmail/BuildTools/OS/Paragon
+++ b/contrib/sendmail/BuildTools/OS/Paragon
@@ -1,4 +1,4 @@
-#	@(#)Paragon	8.3	(Berkeley)	3/12/98
+#	@(#)Paragon	8.3	(Berkeley)	3/12/1998
 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 b0f133d..47ab87c 100644
--- a/contrib/sendmail/BuildTools/OS/PowerUX
+++ b/contrib/sendmail/BuildTools/OS/PowerUX
@@ -1,4 +1,4 @@
-#	@(#)PowerUX	8.5	(Berkeley)	2/12/98
+#	@(#)PowerUX	8.5	(Berkeley)	2/12/1998
 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 3cc0182..a8a67fe 100644
--- a/contrib/sendmail/BuildTools/OS/QNX
+++ b/contrib/sendmail/BuildTools/OS/QNX
@@ -1,4 +1,4 @@
-#	@(#)QNX	8.4	(Berkeley)	2/19/98
+#	@(#)QNX	8.4	(Berkeley)	2/19/1998
 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 1888ae6..4b2d79e 100644
--- a/contrib/sendmail/BuildTools/OS/RISCos
+++ b/contrib/sendmail/BuildTools/OS/RISCos
@@ -1,4 +1,4 @@
-#	@(#)RISCos	8.5	(Berkeley)	3/12/98
+#	@(#)RISCos	8.5	(Berkeley)	3/12/1998
 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 e057fb4..1557b8a 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/98
+#	@(#)RISCos.4_0	8.6	(Berkeley)	3/12/1998
 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
new file mode 100644
index 0000000..16cf89d
--- /dev/null
+++ b/contrib/sendmail/BuildTools/OS/Rhapsody
@@ -0,0 +1,16 @@
+#	@(#)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 a72ba53..e995052 100644
--- a/contrib/sendmail/BuildTools/OS/SCO
+++ b/contrib/sendmail/BuildTools/OS/SCO
@@ -1,4 +1,4 @@
-#	@(#)SCO	8.3	(Berkeley)	2/8/98
+#	@(#)SCO	8.3	(Berkeley)	2/8/1998
 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 027f730..0d458be 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/98
+#	@(#)SCO.4.2	8.5	(Berkeley)	6/30/1998
 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 8f095ac..d7fdc73 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/98
+#	@(#)SCO.5.x	8.10	(Berkeley)	6/30/1998
 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 93cc781..3c27937 100644
--- a/contrib/sendmail/BuildTools/OS/SINIX
+++ b/contrib/sendmail/BuildTools/OS/SINIX
@@ -1,4 +1,4 @@
-#	@(#)SINIX	8.5	(Berkeley)	2/12/98
+#	@(#)SINIX	8.5	(Berkeley)	2/12/1998
 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 f342c3f..92cf101 100644
--- a/contrib/sendmail/BuildTools/OS/SVR4
+++ b/contrib/sendmail/BuildTools/OS/SVR4
@@ -1,4 +1,4 @@
-#	@(#)SVR4	8.6	(Berkeley)	3/12/98
+#	@(#)SVR4	8.6	(Berkeley)	3/12/1998
 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 2a88978..9db9569 100644
--- a/contrib/sendmail/BuildTools/OS/SunOS
+++ b/contrib/sendmail/BuildTools/OS/SunOS
@@ -1,4 +1,4 @@
-#	@(#)SunOS	8.6	(Berkeley)	3/12/98
+#	@(#)SunOS	8.6	(Berkeley)	3/12/1998
 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 05bbc57..0bcbc5f 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/98
+#	@(#)SunOS.4.0	8.6	(Berkeley)	3/12/1998
 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 2383609..fe39bb9 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/98
+#	@(#)SunOS.5.1	8.8	(Berkeley)	3/21/1998
 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 5e635db..80bc087 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/98
+#	@(#)SunOS.5.2	8.8	(Berkeley)	3/21/1998
 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 8f64d21..dcee93e 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/98
+#	@(#)SunOS.5.3	8.8	(Berkeley)	3/21/1998
 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 65e8400..4a6b880 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/98
+#	@(#)SunOS.5.4	8.10	(Berkeley)	3/21/1998
 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 267f16d..64264d7 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/98
+#	@(#)SunOS.5.5	8.11	(Berkeley)	3/21/1998
 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 0537007..da17de8 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/98
+#	@(#)SunOS.5.6	8.10	(Berkeley)	3/21/1998
 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 b030e77..962095d 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/98
+#	@(#)SunOS.5.7	8.11	(Berkeley)	3/21/1998
 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 b668200..938b46d 100644
--- a/contrib/sendmail/BuildTools/OS/Titan
+++ b/contrib/sendmail/BuildTools/OS/Titan
@@ -1,4 +1,4 @@
-#	@(#)Titan	8.5	(Berkeley)	3/12/98
+#	@(#)Titan	8.5	(Berkeley)	3/12/1998
 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 f5df633e..e9073f9 100644
--- a/contrib/sendmail/BuildTools/OS/ULTRIX
+++ b/contrib/sendmail/BuildTools/OS/ULTRIX
@@ -1,5 +1,5 @@
-#	@(#)ULTRIX	8.7	(Berkeley)	3/12/98
-define(`confCC', `cc -Olimit 950')
+#	@(#)ULTRIX	8.8	(Berkeley)	12/18/1998
+define(`confCC', `cc -Olimit 970')
 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 450c91d..078b827 100644
--- a/contrib/sendmail/BuildTools/OS/UMAX
+++ b/contrib/sendmail/BuildTools/OS/UMAX
@@ -1,4 +1,4 @@
-#	@(#)UMAX	8.5	(Berkeley)	3/12/98
+#	@(#)UMAX	8.5	(Berkeley)	3/12/1998
 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 7984fa9..3b05dc0 100644
--- a/contrib/sendmail/BuildTools/OS/UNICOS
+++ b/contrib/sendmail/BuildTools/OS/UNICOS
@@ -1,4 +1,4 @@
-#	@(#)UNICOS	8.7	(Berkeley)	2/26/98
+#	@(#)UNICOS	8.7	(Berkeley)	2/26/1998
 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 a6865e7..b0e2753 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/98
+#	@(#)UNIX_SV.4.x.i386	8.6	(Berkeley)	3/12/1998
 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 207b370..7c1822a 100644
--- a/contrib/sendmail/BuildTools/OS/UX4800
+++ b/contrib/sendmail/BuildTools/OS/UX4800
@@ -1,4 +1,4 @@
-#	@(#)UX4800	8.8	(Berkeley)	3/12/98
+#	@(#)UX4800	8.8	(Berkeley)	3/12/1998
 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 bf30140..438d88d 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/98
+#	@(#)UXPDS.V10	8.9	(Berkeley)	3/12/1998
 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 cacdb4a..f2d0b37 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/98
+#	@(#)UXPDS.V20	8.8	(Berkeley)	3/12/1998
 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
new file mode 100644
index 0000000..77ca82d
--- /dev/null
+++ b/contrib/sendmail/BuildTools/OS/UnixWare.5.i386
@@ -0,0 +1,18 @@
+#	@(#)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 900afcd..095de36 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/98
+#	@(#)dcosx.1.x.NILE	8.3	(Berkeley)	2/8/1998
 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 7d6d867..66132c0 100644
--- a/contrib/sendmail/BuildTools/OS/dgux
+++ b/contrib/sendmail/BuildTools/OS/dgux
@@ -1,4 +1,4 @@
-#	@(#)dgux	8.5	(Berkeley)	3/12/98
+#	@(#)dgux	8.5	(Berkeley)	3/12/1998
 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 3bb6e0e..0177911 100644
--- a/contrib/sendmail/BuildTools/OS/maxion
+++ b/contrib/sendmail/BuildTools/OS/maxion
@@ -1,4 +1,4 @@
-#	@(#)maxion	8.6	(Berkeley)	3/12/98
+#	@(#)maxion	8.6	(Berkeley)	3/12/1998
 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 c5f841f..acee532 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/98
+#	@(#)uts.systemV	8.10	(Berkeley)	3/12/1998
 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.