*** sendmail-work/src/Makefile	Tue Jul 29 11:36:52 1997
--- sendmail-8.8.6/src/Makefile	Fri Mar 28 12:06:01 1997
***************
*** 33,39 ****
  	/usr/sbin/sendmail /usr/bin/mailq
  BINDIR=	/usr/sbin
  BINOWN=	root
! BINGRP=	root
  BINMODE=6555
  
  beforeinstall:
--- 33,39 ----
  	/usr/sbin/sendmail /usr/bin/mailq
  BINDIR=	/usr/sbin
  BINOWN=	root
! BINGRP=	kmem
  BINMODE=6555
  
  beforeinstall:
***************
*** 44,46 ****
--- 44,47 ----
  	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
  	    ${DESTDIR}/usr/share/misc
  
+ .include <bsd.prog.mk>
*** sendmail-work/src/conf.h	Tue Jul 29 09:48:02 1997
--- sendmail-8.8.6/src/conf.h	Thu Jun 12 15:00:26 1997
***************
*** 434,439 ****
--- 434,440 ----
  #   define HASFLOCK	1	/* has flock(2) call */
  #  endif
  #  define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+ #  define TZ_TYPE	TZ_TM_ZONE	/* use tm->tm_zone */
  #  include <vfork.h>
  
  #  ifdef SUNOS403
***************
*** 902,907 ****
--- 903,909 ----
  # define SFS_TYPE	SFS_4ARGS	/* use <sys/statfs.h> 4-arg impl */
  # define SFS_BAVAIL	f_bfree		/* alternate field name */
  # define SPT_TYPE	SPT_SCO		/* write kernel u. area */
+ # define TZ_TYPE	TZ_TM_NAME	/* use tm->tm_name */
  # define UID_T		uid_t
  # define GID_T		gid_t
  # define GIDSET_T	gid_t
***************
*** 1620,1628 ****
--- 1622,1632 ----
  #  include <sys/time.h>
  #  define NEEDVPRINTF	1	/* need a replacement for vprintf(3) */
  #  define LA_TYPE	LA_INT
+ #  define TZ_TYPE	TZ_TM_ZONE	/* use tm->tm_zone */
  # endif
  # ifdef luna2
  #  define LA_TYPE	LA_SUBR
+ #  define TZ_TYPE	TZ_TM_ZONE	/* use tm->tm_zone */
  # endif
  # ifdef luna88k
  #  define HASSNPRINTF	1	/* has snprintf(3) and vsnprintf(3) */
***************
*** 1784,1789 ****
--- 1788,1796 ----
  # ifndef HASFLOCK
  #  define HASFLOCK	1	/* has flock(2) call */
  # endif
+ # ifndef TZ_TYPE
+ #  define TZ_TYPE	TZ_TM_ZONE	/* use tm->tm_zone variable */
+ # endif
  #endif
  
  /* general System V Release 4 defines */
*** sendmail-work/src/Makefiles/Makefile.SunOS.5.5	Wed Jul 30 16:35:09 1997
--- sendmail-8.8.6/src/Makefiles/Makefile.SunOS.5.5	Sun Apr 13 20:29:29 1997
***************
*** 14,20 ****
  # warning: do not use -O with versions of gcc prior to 2.6
  O=	-O
  
! CC=	cc
  
  # define the database mechanism used for alias lookups:
  #	-DNDBM -- use new DBM
--- 14,20 ----
  # warning: do not use -O with versions of gcc prior to 2.6
  O=	-O
  
! CC=	gcc
  
  # define the database mechanism used for alias lookups:
  #	-DNDBM -- use new DBM
***************
*** 23,32 ****
  # The really old (V7) DBM library is no longer supported.
  # See READ_ME for a description of how these flags interact.
  #
! DBMDEF=	-DNDBM 
  
  # environment definitions (e.g., -D_AIX3)
! ENVDEF=	-DSOLARIS=20500 -DSYSTEM5=1 -DBSD=0 -DSPRINTF_CHAR=1 -DVSPRINTF_CHAR=1
  
  # see also conf.h for additional compilation flags
  
--- 23,32 ----
  # The really old (V7) DBM library is no longer supported.
  # See READ_ME for a description of how these flags interact.
  #
! DBMDEF=	-DNDBM -DNIS -DNISPLUS
  
  # environment definitions (e.g., -D_AIX3)
! ENVDEF=	-DSOLARIS=20500
  
  # see also conf.h for additional compilation flags
  
***************
*** 39,45 ****
  # libraries required on your system
  #  delete -l44bsd if you are not running BIND 4.9.x
  #  add -ldb if you add -DNEWDB above (in DBMDEF)
! LIBS=	-lresolv -lsocket -lnsl -lkstat
  
  # location of sendmail binary (usually /usr/sbin or /usr/lib)
  BINDIR=	${DESTDIR}/usr/lib
--- 39,45 ----
  # libraries required on your system
  #  delete -l44bsd if you are not running BIND 4.9.x
  #  add -ldb if you add -DNEWDB above (in DBMDEF)
! LIBS=	-lresolv -l44bsd -lsocket -lnsl -lkstat
  
  # location of sendmail binary (usually /usr/sbin or /usr/lib)
  BINDIR=	${DESTDIR}/usr/lib
***************
*** 86,94 ****
  		ln -s /usr/include/sysexits.h; \
  	fi
  
! NROFF=	nroff 
! #NROFF=	groff -Tascii
! MANDOC=	-me 
  
  aliases.0: aliases.5
  	${NROFF} ${MANDOC} aliases.5 > aliases.0
--- 86,94 ----
  		ln -s /usr/include/sysexits.h; \
  	fi
  
! #NROFF=	nroff -h
! NROFF=	groff -Tascii
! MANDOC=	-mandoc
  
  aliases.0: aliases.5
  	${NROFF} ${MANDOC} aliases.5 > aliases.0