*BSD News Article 82553


Return to BSD News archive

Newsgroups: comp.bugs.2bsd
Path: euryale.cc.adfa.oz.au!newshost.carno.net.au!harbinger.cc.monash.edu.au!news.mel.connect.com.au!munnari.OZ.AU!spool.mu.edu!news.sgi.com!news.sprintlink.net!news-peer.sprintlink.net!howland.erols.net!nntp.primenet.com!usenet.eel.ufl.edu!news.mathworks.com!uunet!in2.uu.net!news.new-york.net!wlbr!moe.2bsd.com!sms
From: sms@moe.2bsd.com (Steven M. Schultz)
Subject: The Grand Reorganization Begins (#337 - 3 of 8)
Organization: 2BSD, Simi Valley CA USA
Message-ID: <E0LGF6.Lu9@moe.2bsd.com>
Date: Sat, 9 Nov 1996 08:18:42 GMT
Lines: 2520

Subject: The Grand Reorganization Begins (#337 - 3 of 8)
Index:	MANY/<MANY> 2.11BSD

Description:
	The directory organization has never been brought up to date.

	UNIX systems for some time now have ceased using /usr/lib and
	/etc as dumping grounds for everything from fonts to print spoolers.

	For some time systems have used /sbin, /usr/sbin, /usr/libexec, 
	/usr/share, and so on rather than dumping everything into /usr/lib 
	or /etc.

Repeat-By:
	By observation and/or having to admin a mixture of 2.11BSD systems
	and systems which use the post 1989/90 directory hierarchy.

	Alternatively you may have, over the years, been one of the folks
	who has asked me "when is the directory layout going to be updated to
	reflect current 'standards'?"

Fix:
	This is #337 (part 3 of 8).  Please see #335 (part 1) for the
	installation instructions.

	Updates #335 thru #342 comprise the 8 part kit which moves everything
	that is not a library out of /usr/lib.  The relocation of misplaced
	items in /etc is not, with one exception, done at this time but will
	be forthcoming soon.

	The good news is that the update can be done "in place" - it will not
	be necessary to dump and reload the system.  The "bad news" is that
	a "make world" (recompile of the system from sources) is necessary.

	The manifest is as follows:

	Part    Patch#	Contents
	----	-----	--------
	1	335	Manifest of files.  Introduction/tour.  Instructions. 
			Shell scripts to perform pre- and post- processing of
			the system.  Suggested changes to configuration files
			in /etc.  A 'shar' file containing new files to be
			added to the system (Makefiles mostly).

	2-8	336-342	Patch files.  Broken into ~64kb pieces.

--------------------------cut here, save as /usr/tmp/337--------------------
*** /usr/doc/smm/07.sendmailop//op.me.old	Thu May 22 12:22:31 1986
--- /usr/doc/smm/07.sendmailop//op.me	Thu Oct 24 22:20:17 1996
***************
*** 5,11 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)op.me	5.8 (Berkeley) 5/9/86
  .\"
  .\" eqn % | troff -me
  .\"if n .ls 2
--- 5,11 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)op.me	5.8.1 (2.11BSD) 1996/10/24
  .\"
  .\" eqn % | troff -me
  .\"if n .ls 2
***************
*** 261,267 ****
  .)b
  This file
  is now ready for installation as
! .i /usr/lib/sendmail.cf .
  .sh 2 "Installation Using the Makefile"
  .pp
  A makefile exists in the root of the
--- 261,267 ----
  .)b
  This file
  is now ready for installation as
! .i /etc/sendmail.cf .
  .sh 2 "Installation Using the Makefile"
  .pp
  A makefile exists in the root of the
***************
*** 341,349 ****
  (cd lib; make)
  .)b
  This will recompile and fill the library.
! .sh 3 "/usr/lib/sendmail"
  .pp
! The binary for sendmail is located in /usr/lib.
  There is a version available in the source directory
  that is probably inadequate for your system.
  You should plan on recompiling and installing the entire system:
--- 341,349 ----
  (cd lib; make)
  .)b
  This will recompile and fill the library.
! .sh 3 "/usr/sbin/sendmail"
  .pp
! The binary for sendmail is located in /usr/sbin.
  There is a version available in the source directory
  that is probably inadequate for your system.
  You should plan on recompiling and installing the entire system:
***************
*** 351,368 ****
  cd src
  make clean
  make
! cp sendmail /usr/lib
! chgrp kmem /usr/lib/sendmail
  .)b
! .sh 3 "/usr/lib/sendmail.cf"
  .pp
  The configuration file
  that you created earlier
! should be installed in /usr/lib/sendmail.cf:
  .(b
! cp cf/\fIsystem\fP.cf /usr/lib/sendmail.cf
  .)b
! .sh 3 "/usr/ucb/newaliases"
  .pp
  If you are running delivermail,
  it is critical that the
--- 351,368 ----
  cd src
  make clean
  make
! cp sendmail /usr/sbin
! chgrp kmem /usr/sbin/sendmail
  .)b
! .sh 3 "/etc/sendmail.cf"
  .pp
  The configuration file
  that you created earlier
! should be installed in /etc/sendmail.cf:
  .(b
! cp cf/\fIsystem\fP.cf /etc/sendmail.cf
  .)b
! .sh 3 "/usr/bin/newaliases"
  .pp
  If you are running delivermail,
  it is critical that the
***************
*** 371,378 ****
  This can just be a link to
  .i sendmail :
  .(b
! rm \-f /usr/ucb/newaliases
! ln /usr/lib/sendmail /usr/ucb/newaliases
  .)b
  .sh 3 "/usr/spool/mqueue"
  .pp
--- 371,378 ----
  This can just be a link to
  .i sendmail :
  .(b
! rm \-f /usr/bin/newaliases
! ln /usr/sbin/sendmail /usr/bin/newaliases
  .)b
  .sh 3 "/usr/spool/mqueue"
  .pp
***************
*** 387,397 ****
  .i mqueue
  should be owned by the sendmail owner
  and mode 755.
! .sh 3 "/usr/lib/aliases*"
  .pp
  The system aliases are held in three files.
  The file
! .q /usr/lib/aliases
  is the master copy.
  A sample is given in
  .q lib/aliases
--- 387,397 ----
  .i mqueue
  should be owned by the sendmail owner
  and mode 755.
! .sh 3 "/etc/aliases*"
  .pp
  The system aliases are held in three files.
  The file
! .q /etc/aliases
  is the master copy.
  A sample is given in
  .q lib/aliases
***************
*** 399,405 ****
  .i must
  be defined:
  .(b
! cp lib/aliases /usr/lib/aliases
  .)b
  You should extend this file with any aliases that are apropos to your system.
  .pp
--- 399,405 ----
  .i must
  be defined:
  .(b
! cp lib/aliases /etc/aliases
  .)b
  You should extend this file with any aliases that are apropos to your system.
  .pp
***************
*** 409,436 ****
  .i dbm \|(3)
  routines.
  These are stored in
! .q /usr/lib/aliases.dir
  and
! .q /usr/lib/aliases.pag.
  These can initially be created as empty files,
  but they will have to be initialized promptly.
  These should be mode 666 if you are running a reasonably relaxed system:
  .(b
! cp /dev/null /usr/lib/aliases.dir
! cp /dev/null /usr/lib/aliases.pag
! chmod 666 /usr/lib/aliases.*
  newaliases
  .)b
! .sh 3 "/usr/lib/sendmail.fc"
  .pp
  If you intend to install the frozen version of the configuration file
  (for quick startup)
! you should create the file /usr/lib/sendmail.fc
  and initialize it.
  This step may be safely skipped.
  .(b
! cp /dev/null /usr/lib/sendmail.fc
! /usr/lib/sendmail \-bz
  .)b
  .sh 3 "/etc/rc"
  .pp
--- 409,436 ----
  .i dbm \|(3)
  routines.
  These are stored in
! .q /etc/aliases.dir
  and
! .q /etc/aliases.pag.
  These can initially be created as empty files,
  but they will have to be initialized promptly.
  These should be mode 666 if you are running a reasonably relaxed system:
  .(b
! cp /dev/null /etc/aliases.dir
! cp /dev/null /etc/aliases.pag
! chmod 666 /etc/aliases.*
  newaliases
  .)b
! .sh 3 "/etc/sendmail.fc"
  .pp
  If you intend to install the frozen version of the configuration file
  (for quick startup)
! you should create the file /etc/sendmail.fc
  and initialize it.
  This step may be safely skipped.
  .(b
! cp /dev/null /etc/sendmail.fc
! /usr/sbin/sendmail \-bz
  .)b
  .sh 3 "/etc/rc"
  .pp
***************
*** 448,456 ****
  as appropriate)
  in the area where it is starting up the daemons:
  .(b
! if [ \-f /usr/lib/sendmail ]; then
  	(cd /usr/spool/mqueue; rm \-f [lnx]f*)
! 	/usr/lib/sendmail \-bd \-q30m &
  	echo \-n ' sendmail' >/dev/console
  fi
  .)b
--- 448,456 ----
  as appropriate)
  in the area where it is starting up the daemons:
  .(b
! if [ \-f /usr/sbin/sendmail ]; then
  	(cd /usr/spool/mqueue; rm \-f [lnx]f*)
! 	/usr/sbin/sendmail \-bd \-q30m &
  	echo \-n ' sendmail' >/dev/console
  fi
  .)b
***************
*** 475,481 ****
  do not include the
  .b \-bd
  flag.
! .sh 3 "/usr/lib/sendmail.hf"
  .pp
  This is the help file used by the SMTP
  .b HELP
--- 475,481 ----
  do not include the
  .b \-bd
  flag.
! .sh 3 "/usr/share/misc/sendmail.hf"
  .pp
  This is the help file used by the SMTP
  .b HELP
***************
*** 483,504 ****
  It should be copied from
  .q lib/sendmail.hf :
  .(b
! cp lib/sendmail.hf /usr/lib
  .)b
! .sh 3 "/usr/lib/sendmail.st"
  .pp
  If you wish to collect statistics
  about your mail traffic,
  you should create the file
! .q /usr/lib/sendmail.st :
  .(b
! cp /dev/null /usr/lib/sendmail.st
! chmod 666 /usr/lib/sendmail.st
  .)b
  This file does not grow.
  It is printed with the program
  .q aux/mailstats.
! .sh 3 "/usr/ucb/newaliases"
  .pp
  If
  .i sendmail
--- 483,504 ----
  It should be copied from
  .q lib/sendmail.hf :
  .(b
! cp lib/sendmail.hf /usr/share/misc
  .)b
! .sh 3 "/var/log/sendmail.st"
  .pp
  If you wish to collect statistics
  about your mail traffic,
  you should create the file
! .q /var/log/sendmail.st :
  .(b
! cp /dev/null /var/log/sendmail.st
! chmod 666 /var/log/sendmail.st
  .)b
  This file does not grow.
  It is printed with the program
  .q aux/mailstats.
! .sh 3 "/usr/bin/newaliases"
  .pp
  If
  .i sendmail
***************
*** 509,516 ****
  flag
  (i.e., will rebuild the alias database;
  see below).
! This should be a link to /usr/lib/sendmail.
! .sh 3 "/usr/ucb/mailq"
  .pp
  If
  .i sendmail
--- 509,516 ----
  flag
  (i.e., will rebuild the alias database;
  see below).
! This should be a link to /usr/sbin/sendmail.
! .sh 3 "/usr/bin/mailq"
  .pp
  If
  .i sendmail
***************
*** 523,529 ****
  .i sendmail
  will print the contents of the mail queue;
  see below).
! This should be a link to /usr/lib/sendmail.
  .sh 1 "NORMAL OPERATIONS"
  .sh 2 "Quick Configuration Startup"
  .pp
--- 523,529 ----
  .i sendmail
  will print the contents of the mail queue;
  see below).
! This should be a link to /usr/sbin/sendmail.
  .sh 1 "NORMAL OPERATIONS"
  .sh 2 "Quick Configuration Startup"
  .pp
***************
*** 532,541 ****
  .b \-bz
  flag:
  .(b
! /usr/lib/sendmail \-bz
  .)b
  This creates the file
! .i /usr/lib/sendmail.fc
  (\c
  .q "frozen configuration" ).
  This file is an image of
--- 532,541 ----
  .b \-bz
  flag:
  .(b
! /usr/sbin/sendmail \-bz
  .)b
  This creates the file
! .i /etc/sendmail.fc
  (\c
  .q "frozen configuration" ).
  This file is an image of
***************
*** 543,549 ****
  data space after reading in the configuration file.
  If this file exists,
  it is used instead of
! .i /usr/lib/sendmail.cf
  .i sendmail.fc
  must be rebuilt manually every time
  .i sendmail.cf
--- 543,549 ----
  data space after reading in the configuration file.
  If this file exists,
  it is used instead of
! .i /etc/sendmail.cf
  .i sendmail.fc
  must be rebuilt manually every time
  .i sendmail.cf
***************
*** 795,801 ****
  To run the old mail queue,
  run the following command:
  .(b
! /usr/lib/sendmail \-oQ/usr/spool/omqueue \-q
  .)b
  The
  .b \-oQ
--- 795,801 ----
  To run the old mail queue,
  run the following command:
  .(b
! /usr/sbin/sendmail \-oQ/usr/spool/omqueue \-q
  .)b
  The
  .b \-oQ
***************
*** 818,824 ****
  The alias database exists in two forms.
  One is a text form,
  maintained in the file
! .i /usr/lib/aliases.
  The aliases are of the form
  .(b
  name: name1, name2, ...
--- 818,824 ----
  The alias database exists in two forms.
  One is a text form,
  maintained in the file
! .i /etc/aliases.
  The aliases are of the form
  .(b
  name: name1, name2, ...
***************
*** 840,848 ****
  .i dbm \|(3)
  library.
  This form is in the files
! .i /usr/lib/aliases.dir
  and
! .i /usr/lib/aliases.pag.
  This is the form that
  .i sendmail
  actually uses to resolve aliases.
--- 840,848 ----
  .i dbm \|(3)
  library.
  This form is in the files
! .i /etc/aliases.dir
  and
! .i /etc/aliases.pag.
  This is the form that
  .i sendmail
  actually uses to resolve aliases.
***************
*** 860,866 ****
  .b \-bi
  flag:
  .(b
! /usr/lib/sendmail \-bi
  .)b
  .pp
  If the
--- 860,866 ----
  .b \-bi
  flag:
  .(b
! /usr/sbin/sendmail \-bi
  .)b
  .pp
  If the
***************
*** 1066,1072 ****
  .b \-q
  flag may be combined in one call:
  .(b
! /usr/lib/sendmail \-bd \-q30m
  .)b
  .sh 2 "Forcing the Queue"
  .pp
--- 1066,1072 ----
  .b \-q
  flag may be combined in one call:
  .(b
! /usr/sbin/sendmail \-bd \-q30m
  .)b
  .sh 2 "Forcing the Queue"
  .pp
***************
*** 1080,1086 ****
  flag (verbose)
  when this is done to watch what happens:
  .(b
! /usr/lib/sendmail \-q \-v
  .)b
  .sh 2 "Debugging"
  .pp
--- 1080,1086 ----
  flag (verbose)
  when this is done to watch what happens:
  .(b
! /usr/sbin/sendmail \-q \-v
  .)b
  .sh 2 "Debugging"
  .pp
***************
*** 1124,1135 ****
  .b \-C
  flag; for example,
  .(b
! /usr/lib/sendmail \-Ctest.cf
  .)b
  uses the configuration file
  .i test.cf
  instead of the default
! .i /usr/lib/sendmail.cf.
  If the
  .b \-C
  flag has no value
--- 1124,1135 ----
  .b \-C
  flag; for example,
  .(b
! /usr/sbin/sendmail \-Ctest.cf
  .)b
  uses the configuration file
  .i test.cf
  instead of the default
! .i /etc/sendmail.cf.
  If the
  .b \-C
  flag has no value
***************
*** 1143,1149 ****
  flag.
  For example,
  .(b
! /usr/lib/sendmail \-oT2m
  .)b
  sets the
  .b T
--- 1143,1149 ----
  flag.
  For example,
  .(b
! /usr/sbin/sendmail \-oT2m
  .)b
  sets the
  .b T
***************
*** 1234,1240 ****
  with a short message timeout.
  For example,
  .(b
! /usr/lib/sendmail \-oT1d \-q
  .)b
  will run the queue
  and flush anything that is one day old.
--- 1234,1240 ----
  with a short message timeout.
  For example,
  .(b
! /usr/sbin/sendmail \-oT1d \-q
  .)b
  will run the queue
  and flush anything that is one day old.
***************
*** 1471,1477 ****
  .pp
  At Berkeley
  we have the alias database
! (/usr/lib/aliases*)
  mode 666.
  There are some dangers inherent in this approach:
  any user can add him-/her-self
--- 1471,1477 ----
  .pp
  At Berkeley
  we have the alias database
! (/etc/aliases*)
  mode 666.
  There are some dangers inherent in this approach:
  any user can add him-/her-self
***************
*** 1492,1500 ****
  .i aliases.dir
  and
  .i aliases.pag
! (both in /usr/lib).
  The mode on these files should match the mode
! on /usr/lib/aliases.
  If
  .i aliases
  is writable
--- 1492,1500 ----
  .i aliases.dir
  and
  .i aliases.pag
! (both in /etc).
  The mode on these files should match the mode
! on /etc/aliases.
  If
  .i aliases
  is writable
***************
*** 3926,3936 ****
  .i sendmail
  creates or generates.
  .nr ii 1i
! .ip "/usr/lib/sendmail"
  The binary of
  .i sendmail .
  .ip /usr/bin/newaliases
! A link to /usr/lib/sendmail;
  causes the alias database to be rebuilt.
  Running this program is completely equivalent to giving
  .i sendmail
--- 3926,3936 ----
  .i sendmail
  creates or generates.
  .nr ii 1i
! .ip "/usr/sbin/sendmail"
  The binary of
  .i sendmail .
  .ip /usr/bin/newaliases
! A link to /usr/sbin/sendmail;
  causes the alias database to be rebuilt.
  Running this program is completely equivalent to giving
  .i sendmail
***************
*** 3943,3961 ****
  .b \-bp
  flag to
  .i sendmail .
! .ip /usr/lib/sendmail.cf
  The configuration file,
  in textual form.
! .ip /usr/lib/sendmail.fc
  The configuration file
  represented as a memory image.
! .ip /usr/lib/sendmail.hf
  The SMTP help file.
! .ip /usr/lib/sendmail.st
  A statistics file; need not be present.
! .ip /usr/lib/aliases
  The textual version of the alias file.
! .ip /usr/lib/aliases.{pag,dir}
  The alias file in
  .i dbm \|(3)
  format.
--- 3943,3961 ----
  .b \-bp
  flag to
  .i sendmail .
! .ip /etc/sendmail.cf
  The configuration file,
  in textual form.
! .ip /etc/sendmail.fc
  The configuration file
  represented as a memory image.
! .ip /usr/share/misc/sendmail.hf
  The SMTP help file.
! .ip /var/log/sendmail.st
  A statistics file; need not be present.
! .ip /etc/aliases
  The textual version of the alias file.
! .ip /etc/aliases.{pag,dir}
  The alias file in
  .i dbm \|(3)
  format.
*** /usr/doc/usd/11.notes/4.6.old	Mon May 26 19:23:46 1986
--- /usr/doc/usd/11.notes/4.6	Thu Oct 24 22:43:44 1996
***************
*** 1,4 ****
! .\"	@(#)4.6	6.1 (Berkeley) 5/26/86
  .\"
  .se "Mail to Notesfiles"
  
--- 1,4 ----
! .\"	@(#)4.6	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .se "Mail to Notesfiles"
  
***************
*** 16,23 ****
  	To send mail addressed to ``somenotes'' 
  to the notesfile ``somenotes'' with the 4.1 Bsd or later mail delivery
  mechanism
! add the following line to the file /usr/lib/aliases.
! The second line shows the general format for /usr/lib/aliases entries
  which feed a notesfile.
  If the Notesfile utilities are stored in a different directory, the
  path name should be changed appropriately.
--- 16,23 ----
  	To send mail addressed to ``somenotes'' 
  to the notesfile ``somenotes'' with the 4.1 Bsd or later mail delivery
  mechanism
! add the following line to the file /etc/aliases.
! The second line shows the general format for /etc/aliases entries
  which feed a notesfile.
  If the Notesfile utilities are stored in a different directory, the
  path name should be changed appropriately.
*** /usr/doc/usd/11.notes/a.checklist.old	Mon May 26 19:24:05 1986
--- /usr/doc/usd/11.notes/a.checklist	Thu Oct 24 22:44:43 1996
***************
*** 1,4 ****
! .\"	@(#)a.checklist	6.1 (Berkeley) 5/26/86
  .\"
  .ls 1
  .ap A "Notesfile Installation Checklist"
--- 1,4 ----
! .\"	@(#)a.checklist	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .ls 1
  .ap A "Notesfile Installation Checklist"
***************
*** 314,320 ****
  Modify UUCP's ``uuxqt.c'' to allow remote execution of ``nfrcv''.
  This is unnecessary if no notesfile networking will be done
  or if another remote execution mechanism will be used.
! Some versions of UUCP have a file ``/usr/lib/uucp/L.cmds''
  which contains names of permitted commands.
  .iz
  Modify /etc/rc to remove notesfile locks at boot time.
--- 314,320 ----
  Modify UUCP's ``uuxqt.c'' to allow remote execution of ``nfrcv''.
  This is unnecessary if no notesfile networking will be done
  or if another remote execution mechanism will be used.
! Some versions of UUCP have a file ``/etc/uucp/L.cmds''
  which contains names of permitted commands.
  .iz
  Modify /etc/rc to remove notesfile locks at boot time.
***************
*** 453,460 ****
  .a1 "Mail to Notesfiles"
  
  	To use the nfmail program with the 4.1 BSD /etc/delivermail
! or the 4.2 BSD /usr/lib/sendmail
! insert lines of the following form in the file /usr/lib/aliases.
  
  .in +1i
  .nf
--- 453,460 ----
  .a1 "Mail to Notesfiles"
  
  	To use the nfmail program with the 4.1 BSD /etc/delivermail
! or the 4.2 BSD /usr/sbin/sendmail
! insert lines of the following form in the file /etc/aliases.
  
  .in +1i
  .nf
*** /usr/doc/usd/11.notes/b.interface.old	Mon May 26 19:24:20 1986
--- /usr/doc/usd/11.notes/b.interface	Thu Oct 24 22:45:42 1996
***************
*** 1,4 ****
! .\"	@(#)b.interface	6.1 (Berkeley) 5/26/86
  .\"
  .ls 1
  .ap B "Interfacing Notesfiles to News"
--- 1,4 ----
! .\"	@(#)b.interface	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .ls 1
  .ap B "Interfacing Notesfiles to News"
***************
*** 407,413 ****
  Check /usr/lib/news/sys
  to see that news will be forwarded to the notesfile system.
  .iz
! Make entries in /usr/lib/crontab to
  invoke newsoutput occcasionally.
  We use every 6 hours.
  .iz
--- 407,413 ----
  Check /usr/lib/news/sys
  to see that news will be forwarded to the notesfile system.
  .iz
! Make entries in /etc/crontab to
  invoke newsoutput occcasionally.
  We use every 6 hours.
  .iz
*** /usr/doc/usd/16.ex/ex.rm.old	Fri May 30 18:40:42 1986
--- /usr/doc/usd/16.ex/ex.rm	Thu Oct 24 22:47:20 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ex.rm	6.1 (Berkeley) 5/30/86
  .\"
  .EH 'USD:16-%''Ex Reference Manual'
  .OH 'Ex Reference Manual''USD:16-%'
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ex.rm	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .EH 'USD:16-%''Ex Reference Manual'
  .OH 'Ex Reference Manual''USD:16-%'
***************
*** 2106,2112 ****
  Tags are not significant beyond this many characters.
  A value of zero (the default) means that all characters are significant.
  .LC
! \fBtags\fR	default: tags=tags /usr/lib/tags
  .ZP
  A path of files to be used as tag files for the
  .I tag
--- 2106,2112 ----
  Tags are not significant beyond this many characters.
  A value of zero (the default) means that all characters are significant.
  .LC
! \fBtags\fR	default: tags=tags /usr/share/misc/tags
  .ZP
  A path of files to be used as tag files for the
  .I tag
***************
*** 2114,2120 ****
  A requested tag is searched for in the specified files, sequentially.
  By default, files called
  .B tags
! are searched for in the current directory and in /usr/lib
  (a master file for the entire system).
  .LC
  \fBterm\fR	from environment TERM
--- 2114,2120 ----
  A requested tag is searched for in the specified files, sequentially.
  By default, files called
  .B tags
! are searched for in the current directory and in /usr/share/misc
  (a master file for the entire system).
  .LC
  \fBterm\fR	from environment TERM
*** /usr/doc/usd/21.msdiffs/ms.diffs.old	Mon Jun  2 15:51:01 1986
--- /usr/doc/usd/21.msdiffs/ms.diffs	Thu Oct 24 22:48:21 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ms.diffs	6.1 (Berkeley) 6/2/86
  .\"
  .nr LL 6.5i
  .nr FL 6.0i
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ms.diffs	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .nr LL 6.5i
  .nr FL 6.0i
***************
*** 254,260 ****
  the special accent mark definitions (.AM),
  table of contents macros (.XS and .XE),
  and macros to format the optional cover page.
! The code for the \*ms package lives in /usr/lib/tmac/tmac.s,
! and sourced files reside in the directory /usr/ucb/lib/ms.
  .sp
  .tl '''\*(DY'
--- 254,260 ----
  the special accent mark definitions (.AM),
  table of contents macros (.XS and .XE),
  and macros to format the optional cover page.
! The code for the \*ms package lives in /usr/share/tmac/tmac.s,
! and sourced files reside in the directory /usr/src/share/ms.
  .sp
  .tl '''\*(DY'
*** /usr/doc/usd/23.meref/ref.me.old	Thu Apr 17 18:24:46 1986
--- /usr/doc/usd/23.meref/ref.me	Thu Oct 24 22:49:31 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ref.me	6.3 (Berkeley) 4/17/86
  .\"
  .ll 6.5i
  .lt 6.5i
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ref.me	6.3.1 (2.11BSD) 1996/10/24
  .\"
  .ll 6.5i
  .lt 6.5i
***************
*** 1645,1651 ****
  Print a letterhead at the current position on the page.
  The format of the letterhead must be defined
  in the file
! .b /usr/lib/me/letterhead.me
  by your local systems staff.
  Some environments may require
  .i ditroff
--- 1645,1651 ----
  Print a letterhead at the current position on the page.
  The format of the letterhead must be defined
  in the file
! .b /usr/share/me/letterhead.me
  by your local systems staff.
  Some environments may require
  .i ditroff
***************
*** 1656,1662 ****
  .DE
  This macro loads another set of macros
  (in
! .b /usr/lib/me/local.me )
  which is intended to be a set of locally defined macros.
  These macros
  should all be of the form
--- 1656,1662 ----
  .DE
  This macro loads another set of macros
  (in
! .b /usr/share/me/local.me )
  which is intended to be a set of locally defined macros.
  These macros
  should all be of the form
***************
*** 1869,1875 ****
  .i N .
  Additionally,
  this macro loads the file
! .b /usr/lib/me/acm.me ,
  which may later be augmented with other macros
  useful for printing papers
  for ACM conferences.
--- 1869,1875 ----
  .i N .
  Additionally,
  this macro loads the file
! .b /usr/share/me/acm.me ,
  which may later be augmented with other macros
  useful for printing papers
  for ACM conferences.
*** /usr/doc/usd/29.refer/refer.bib.old	Mon Jun  2 16:26:57 1986
--- /usr/doc/usd/29.refer/refer.bib	Thu Oct 24 22:51:09 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)refer.bib	6.1 (Berkeley) 6/2/86
  .\"
  .EH 'USD:29-%''Refer \(em A Bibliography System'
  .OH 'Refer \(em A Bibliography System''USD:29-%'
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)refer.bib	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .EH 'USD:29-%''Refer \(em A Bibliography System'
  .OH 'Refer \(em A Bibliography System''USD:29-%'
***************
*** 259,265 ****
  annotations are entered in the %X (abstract) field.
  \fBRoffbib\fP is a shell script that calls
  \fBrefer\0\-B\fP and \fBnroff\0\-mbib\fP\|.
! It uses the macro definitions that reside in /usr/lib/tmac/tmac.bib,
  which you can redefine if you know \fBnroff\fP and \fBtroff\fP.
  Note that \fBrefer\fP will print the %H and %O commentaries,
  but will ignore abstracts in the %X field;
--- 259,265 ----
  annotations are entered in the %X (abstract) field.
  \fBRoffbib\fP is a shell script that calls
  \fBrefer\0\-B\fP and \fBnroff\0\-mbib\fP\|.
! It uses the macro definitions that reside in /usr/share/tmac/tmac.bib,
  which you can redefine if you know \fBnroff\fP and \fBtroff\fP.
  Note that \fBrefer\fP will print the %H and %O commentaries,
  but will ignore abstracts in the %X field;
***************
*** 615,621 ****
  \&.][  1  journal-article
  .DE
  These string definitions are sent to \fBnroff\fP,
! which can use the \-ms macros defined in /usr/lib/mx/tmac.xref
  to take care of formatting things properly.
  The initializing macro \fB.]\-\fP precedes the string definitions,
  and the labeled macro \fB.][\fP follows.
--- 615,621 ----
  \&.][  1  journal-article
  .DE
  These string definitions are sent to \fBnroff\fP,
! which can use the \-ms macros defined in /usr/share/mx/tmac.xref
  to take care of formatting things properly.
  The initializing macro \fB.]\-\fP precedes the string definitions,
  and the labeled macro \fB.][\fP follows.
***************
*** 726,735 ****
  the \fBrefer\fP macros used by \fBroffbib\fP\|.
  .PP
  The \fBrefer\fP macros for \fBnroff/troff\fP supplied by
! the \-ms macro package reside in /usr/lib/mx/tmac.xref;
  they are reference macros, for producing footnotes or endnotes.
  The \fBrefer\fP macros used by \fBroffbib,\fP
! on the other hand, reside in /usr/lib/tmac/tmac.bib;
  they are for producing a stand-alone bibliography.
  .PP
  To change the macros used by \fBroffbib,\fP
--- 726,735 ----
  the \fBrefer\fP macros used by \fBroffbib\fP\|.
  .PP
  The \fBrefer\fP macros for \fBnroff/troff\fP supplied by
! the \-ms macro package reside in /usr/share/mx/tmac.xref;
  they are reference macros, for producing footnotes or endnotes.
  The \fBrefer\fP macros used by \fBroffbib,\fP
! on the other hand, reside in /usr/share/tmac/tmac.bib;
  they are for producing a stand-alone bibliography.
  .PP
  To change the macros used by \fBroffbib,\fP
***************
*** 738,744 ****
  These two commands will get you a copy of \fBroffbib\fP
  and the macros it uses: \(dg
  .DS
! % \fBcp  /usr/lib/tmac/tmac.bib  bibmac\fP
  .DE
  You can proceed to change bibmac as much as you like.
  Then when you use \fBroffbib\fP,
--- 738,744 ----
  These two commands will get you a copy of \fBroffbib\fP
  and the macros it uses: \(dg
  .DS
! % \fBcp  /usr/share/tmac/tmac.bib  bibmac\fP
  .DE
  You can proceed to change bibmac as much as you like.
  Then when you use \fBroffbib\fP,
***************
*** 754,760 ****
  for use with \fBnroff\fP and the \-ms macros,
  you will need to get a copy of \*Qtmac.xref\*U:
  .DS
! % \fBcp  /usr/lib/ms/s.ref  refmac\fP
  .DE
  These macros are much like \*Qbibmac\*U,
  except they have .FS and .FE requests,
--- 754,760 ----
  for use with \fBnroff\fP and the \-ms macros,
  you will need to get a copy of \*Qtmac.xref\*U:
  .DS
! % \fBcp  /usr/share/ms/s.ref  refmac\fP
  .DE
  These macros are much like \*Qbibmac\*U,
  except they have .FS and .FE requests,
*** /usr/doc/usd/30.invert/refer.old	Thu May 22 16:42:17 1986
--- /usr/doc/usd/30.invert/refer	Thu Oct 24 22:52:55 1996
***************
*** 1,4 ****
! .\"	@(#)refer	6.1 (Berkeley) 5/22/86
  .\"
  .... refer | tbl | nroff -ms
  .EH 'USD:30-%''Some Applications of Inverted Indexes on the UNIX System'
--- 1,4 ----
! .\"	@(#)refer	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .... refer | tbl | nroff -ms
  .EH 'USD:30-%''Some Applications of Inverted Indexes on the UNIX System'
***************
*** 424,430 ****
  Since they are usually invoked as parts of higher-level commands,
  they are not in the default command
  directory, but are available to any user in the directory
! .I /usr/lib/refer .
  Three programs are of interest:
  .I mkey ,
  which isolates keys from input files;
--- 424,430 ----
  Since they are usually invoked as parts of higher-level commands,
  they are not in the default command
  directory, but are available to any user in the directory
! .I /usr/libexec/refer .
  Three programs are of interest:
  .I mkey ,
  which isolates keys from input files;
***************
*** 471,477 ****
  \-c \f2name	T{
  Name of file of common words;
  default is
! .I /usr/lib/eign.
  T}
  \-f \f2name	T{
  Read a list of files from
--- 471,477 ----
  \-c \f2name	T{
  Name of file of common words;
  default is
! .I /usr/share/misc/eign.
  T}
  \-f \f2name	T{
  Read a list of files from
***************
*** 513,519 ****
  .PP
  The normal arguments for indexing references are
  the defaults, which are
! .I "\-c /usr/lib/eign" ,
  .I \-n100 ,
  and
  .I \-l3 .
--- 513,519 ----
  .PP
  The normal arguments for indexing references are
  the defaults, which are
! .I "\-c /usr/share/misc/eign" ,
  .I \-n100 ,
  and
  .I \-l3 .
*** /usr/include/paths.h.old	Tue Jun 25 20:30:50 1996
--- /usr/include/paths.h	Mon Oct 21 19:50:59 1996
***************
*** 14,20 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.5 (2.11BSD) 1996/6/25
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
--- 14,20 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.6 (2.11BSD) 1996/10/21
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
***************
*** 29,35 ****
  #define	_PATH_LASTLOG	"/usr/adm/lastlog"
  #define	_PATH_TMP	"/tmp/"
  #define	_PATH_VARTMP	"/usr/tmp/"
! #define	_PATH_SENDMAIL	"/usr/lib/sendmail"
  #define	_PATH_DEVDB	"/var/run/dev"
  #define	_PATH_VARRUN	"/var/run/"
  #define	_PATH_CTIMED	"/usr/libexec/ctimed"
--- 29,35 ----
  #define	_PATH_LASTLOG	"/usr/adm/lastlog"
  #define	_PATH_TMP	"/tmp/"
  #define	_PATH_VARTMP	"/usr/tmp/"
! #define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
  #define	_PATH_DEVDB	"/var/run/dev"
  #define	_PATH_VARRUN	"/var/run/"
  #define	_PATH_CTIMED	"/usr/libexec/ctimed"
*** /usr/src/Makefile.old	Tue Jun 25 20:05:01 1996
--- /usr/src/Makefile	Sat Oct 26 23:08:45 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.14	(2.11BSD)	96/6/25
  #
  # This makefile is designed to be run as:
  #	make build
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.15	(2.11BSD)	96/10/21
  #
  # This makefile is designed to be run as:
  #	make build
***************
*** 42,49 ****
  
  # Programs that live in subdirectories, and have makefiles of their own.
  #
  LIBDIR= lib usr.lib
! SRCDIR=	bin etc games libexec local new ucb usr.bin man
  
  all:	${LIBDIR} ${SRCDIR}
  
--- 42,52 ----
  
  # Programs that live in subdirectories, and have makefiles of their own.
  #
+ # 'share' has to be towards the front of the list because programs such as
+ # lint(1) need their data files, etc installed first.
+ 
  LIBDIR= lib usr.lib
! SRCDIR=	share bin sbin etc games libexec local new ucb usr.bin usr.sbin man
  
  all:	${LIBDIR} ${SRCDIR}
  
*** /usr/src/bin/adb/main.c.old	Wed Jan 12 23:05:21 1994
--- /usr/src/bin/adb/main.c	Mon Oct 21 21:26:16 1996
***************
*** 32,38 ****
  	char	*symfil;
  	char	*corfil;
  	char	*printptr;
! 	char	*Ipath = "/usr/lib/adb";
  
  long	round(a,b)
  long		a, b;
--- 32,38 ----
  	char	*symfil;
  	char	*corfil;
  	char	*printptr;
! 	char	*Ipath = "/usr/share/adb";
  
  long	round(a,b)
  long		a, b;
*** /usr/src/bin/diff/Makefile.old	Mon Jan 18 08:45:19 1993
--- /usr/src/bin/diff/Makefile	Mon Oct 21 21:29:46 1996
***************
*** 1,7 ****
! #	@(#)Makefile	4.1	2/9/83
  #
  DIFF=	/bin/diff
! DIFFH=	/usr/lib/diffh
  PR=	/bin/pr
  CFLAGS=	-O -DDIFF='"${DIFF}"' -DDIFFH='"${DIFFH}"' -DPR='"${PR}"'
  SEPFLAG=-i
--- 1,7 ----
! #	@(#)Makefile	4.1.1	1996/10/21
  #
  DIFF=	/bin/diff
! DIFFH=	/usr/libexec/diffh
  PR=	/bin/pr
  CFLAGS=	-O -DDIFF='"${DIFF}"' -DDIFFH='"${DIFFH}"' -DPR='"${PR}"'
  SEPFLAG=-i
***************
*** 24,27 ****
  
  install: all
  	install -s diff ${DESTDIR}/bin/diff
! 	install -s diffh ${DESTDIR}/usr/lib/diffh
--- 24,27 ----
  
  install: all
  	install -s diff ${DESTDIR}/bin/diff
! 	install -s diffh ${DESTDIR}/usr/libexec/diffh
*** /usr/src/bin/rmail.c.old	Sun Feb  8 14:24:53 1987
--- /usr/src/bin/rmail.c	Mon Oct 21 21:32:48 1996
***************
*** 1,5 ****
! #ifndef lint
! static char sccsid[] =	"@(#)rmail.c	4.8 (Berkeley) 5/15/86";
  #endif
  
  /*
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] =	"@(#)rmail.c	4.8.1 (2.11BSD) 1996/10/21";
  #endif
  
  /*
***************
*** 11,31 ****
  **	lines.
  */
  
! # include <stdio.h>
! # include <sysexits.h>
  
  typedef char	bool;
  #define TRUE	1
  #define FALSE	0
  
- extern FILE	*popen();
- extern char	*index();
- extern char	*rindex();
- 
  bool	Debug;
  
- # define MAILER	"/usr/lib/sendmail"
- 
  main(argc, argv)
  	char **argv;
  {
--- 11,27 ----
  **	lines.
  */
  
! #include <stdio.h>
! #include <string.h>
! #include <sysexits.h>
! #include <paths.h>
  
  typedef char	bool;
  #define TRUE	1
  #define FALSE	0
  
  bool	Debug;
  
  main(argc, argv)
  	char **argv;
  {
***************
*** 99,105 ****
  	}
  	(void) strcat(from, uf);
  
! 	(void) sprintf(cmd, "%s -ee -f%s -i", MAILER, from);
  	while (*++argv != NULL)
  	{
  		(void) strcat(cmd, " '");
--- 95,101 ----
  	}
  	(void) strcat(from, uf);
  
! 	(void) sprintf(cmd, "%s -ee -f%s -i", _PATH_SENDMAIL, from);
  	while (*++argv != NULL)
  	{
  		(void) strcat(cmd, " '");
*** /usr/src/bin/test/Makefile.old	Mon Mar 13 22:16:18 1995
--- /usr/src/bin/test/Makefile	Sun Oct 27 21:00:46 1996
***************
*** 1,8 ****
  #	Makefile for test
  #
! #	Robin Birch	11 march 1995
  #
! #	Version 1.1
  #
  SEPFLAG= -i
  CFLAGS = -O
--- 1,9 ----
  #	Makefile for test
  #
! #	1.1 	Robin Birch	11 march 1995
! #	1.2 	Steven Schultz	27 october 1996
  #
! #	Version 1.2
  #
  SEPFLAG= -i
  CFLAGS = -O
***************
*** 22,28 ****
  	install -s -m 755 -g bin -o bin test ${DESTDIR}/bin
  	rm -f ${DESTDIR}/bin/[
  	ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[
! 	install -m 444 -g bin -o bin test.0 ${DESTDIR}/usr/man/cat1
  
  clean:	
  	rm -f *.o test *.core test.0
--- 23,29 ----
  	install -s -m 755 -g bin -o bin test ${DESTDIR}/bin
  	rm -f ${DESTDIR}/bin/[
  	ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[
! 	install -c -m 444 -g bin -o bin test.0 ${DESTDIR}/usr/man/cat1
  
  clean:	
  	rm -f *.o test *.core test.0
*** /usr/src/etc/MANIFEST.old	Thu Jan  5 23:07:18 1989
--- /usr/src/etc/MANIFEST	Sat Oct 26 23:07:07 1996
***************
*** 1,7 ****
  Application	Version
  -----------	-------
  Makefile	4.3  (small mods for load type (separate I&D or pure))
- XNSrouted/	4.3  (untested)
  ac.c		4.3
  accton.c	4.3
  arff.c		UNIMPLEMENTED
--- 1,6 ----
*** /usr/src/etc/Makefile.old	Thu Mar 28 20:28:53 1996
--- /usr/src/etc/Makefile	Sat Oct 26 23:06:23 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.14.6 (2.11BSD GTE) 1996/3/26
  #
  DESTDIR=
  CFLAGS=	-O
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.14.7 (2.11BSD GTE) 1996/10/21
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 12,18 ****
  # Programs that live in subdirectories, and have makefiles of their own.
  #
  SUBDIR=	chroot config dev_mkdb dump fingerd fsck ftpd getty htable implog \
! 	named restor routed talkd termcap tftpd timed tzone XNSrouted \
  	mkpasswd mount ping quotacheck vipw rlogind rshd tcpd umount
  
  # Shell scripts that need only be installed and are never removed.
--- 12,18 ----
  # Programs that live in subdirectories, and have makefiles of their own.
  #
  SUBDIR=	chroot config dev_mkdb dump fingerd fsck ftpd getty htable implog \
! 	named restor routed talkd tftpd timed tzone \
  	mkpasswd mount ping quotacheck vipw rlogind rshd tcpd umount
  
  # Shell scripts that need only be installed and are never removed.
*** /usr/src/etc/catman.c.old	Mon Jan 18 08:46:33 1993
--- /usr/src/etc/catman.c	Mon Oct 21 21:37:36 1996
***************
*** 4,18 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char sccsid[] = "@(#)catman.c	5.7 (Berkeley) 5/27/86";
! #endif not lint
  
  /*
   * catman: update cat'able versions of manual pages
--- 4,16 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)catman.c	5.7.1 (2.11BSD) 1996/10/21";
! #endif
  
  /*
   * catman: update cat'able versions of manual pages
***************
*** 25,30 ****
--- 23,30 ----
  #include <sys/time.h>
  #include <sys/dir.h>
  #include <ctype.h>
+ #include <string.h>
+ #include <stdlib.h>
  
  char	buf[BUFSIZ];
  char	pflag;
***************
*** 36,45 ****
  char	lncat[MAXNAMLEN+9] = "../catx/";
  char	*manpath = "/usr/man";
  char	*sections = "12345678ln";
! char	*makewhatis = "/usr/lib/makewhatis";
! char	*index(), *rindex();
! char	*strcpy();
! char	*getenv();
  
  main(ac, av)
  	int ac;
--- 36,42 ----
  char	lncat[MAXNAMLEN+9] = "../catx/";
  char	*manpath = "/usr/man";
  char	*sections = "12345678ln";
! char	*makewhatis = "/usr/sbin/makewhatis";
  
  main(ac, av)
  	int ac;
*** /usr/src/etc/cron.c.old	Sun Feb 15 20:51:17 1987
--- /usr/src/etc/cron.c	Mon Oct 21 21:41:39 1996
***************
*** 1,5 ****
! #ifndef lint
! static char *sccsid = "@(#)cron.c	4.12 (Berkeley) 5/27/86";
  #endif
  
  #include <sys/types.h>
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)cron.c	4.12.1 (2.11BSD) 1996/10/21";
  #endif
  
  #include <sys/types.h>
***************
*** 13,28 ****
  #include <sys/file.h>
  #include <pwd.h>
  #include <fcntl.h>
  
  #define	LISTS	(2*BUFSIZ)
  #define	MAXLIN	BUFSIZ
  
  #ifndef CRONTAB
! #define CRONTAB "/usr/lib/crontab"
  #endif
  
  #ifndef CRONTABLOC
! #define CRONTABLOC  "/usr/lib/crontab.local"
  #endif
  
  #define	EXACT	100
--- 13,29 ----
  #include <sys/file.h>
  #include <pwd.h>
  #include <fcntl.h>
+ #include <stdlib.h>
  
  #define	LISTS	(2*BUFSIZ)
  #define	MAXLIN	BUFSIZ
  
  #ifndef CRONTAB
! #define CRONTAB "/etc/crontab"
  #endif
  
  #ifndef CRONTABLOC
! #define CRONTABLOC  "/etc/crontab.local"
  #endif
  
  #define	EXACT	100
***************
*** 36,43 ****
  time_t	itime;
  struct	tm *loct;
  struct	tm *localtime();
- char	*malloc();
- char	*realloc();
  int	reapchild();
  int	flag;
  char	*list;
--- 37,42 ----
***************
*** 56,62 ****
  	time_t filetime = 0;
  	time_t lfiletime = 0;
  	char c;
- 	extern char *optarg;
  
  	if (fork())
  		exit(0);
--- 55,60 ----
***************
*** 219,225 ****
  	 * extra realloc's needed in append() for a large crontab.
  	 */
  	if (list == 0) {
! 		list = malloc(LISTS);
  		listsize = LISTS;
  	}
  	listend = list;
--- 217,223 ----
  	 * extra realloc's needed in append() for a large crontab.
  	 */
  	if (list == 0) {
! 		list = (char *)malloc(LISTS);
  		listsize = LISTS;
  	}
  	listend = list;
***************
*** 241,247 ****
  		int length = cp - list;
  
  		listsize += LISTS;
! 		list = realloc(list, listsize);
  		cp = list + length;
  	}
  	ocp = cp;
--- 239,245 ----
  		int length = cp - list;
  
  		listsize += LISTS;
! 		list = (char *)realloc(list, listsize);
  		cp = list + length;
  	}
  	ocp = cp;
*** /usr/src/etc/named/master/Index.old	Sun Feb 28 21:31:02 1988
--- /usr/src/etc/named/master/Index	Mon Oct 21 21:43:18 1996
***************
*** 4,10 ****
  atod.y  - used to convert you aliases file into MB records
  		yacc atod.y
  		cc -o atod y.tab.c
! 		atod < /usr/lib/aliases > aliases.db
  
  named.boot - boot file for a secondary name server
  named.boot.master - boot file for a master name server
--- 4,10 ----
  atod.y  - used to convert you aliases file into MB records
  		yacc atod.y
  		cc -o atod y.tab.c
! 		atod < /etc/aliases > aliases.db
  
  named.boot - boot file for a secondary name server
  named.boot.master - boot file for a master name server
*** /usr/src/etc/named/tools/nslookup/Makefile.old	Mon Apr 26 09:25:55 1993
--- /usr/src/etc/named/tools/nslookup/Makefile	Mon Oct 21 21:44:30 1996
***************
*** 14,20 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.20 (Berkeley) 10/2/89
  #
  CFLAGS=	-O
  RES=
--- 14,20 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.20.1 (2.11BSD) 1996/10/21
  #
  CFLAGS=	-O
  RES=
***************
*** 41,47 ****
  
  install: nslookup nslookup.0
  	install -s -o bin -g bin -m 755 nslookup ${DESTDIR}/usr/bin/nslookup
! 	install -c -o bin -g bin -m 444 nslookup.help ${DESTDIR}/usr/lib/nslookup.help
  	install -c -o bin -g bin -m 444 nslookup.0 ${DESTDIR}/usr/man/cat1/nslookup.0
  
  nslookup.0: nslookup.8
--- 41,47 ----
  
  install: nslookup nslookup.0
  	install -s -o bin -g bin -m 755 nslookup ${DESTDIR}/usr/bin/nslookup
! 	install -c -o bin -g bin -m 444 nslookup.help ${DESTDIR}/usr/share/misc/nslookup.help
  	install -c -o bin -g bin -m 444 nslookup.0 ${DESTDIR}/usr/man/cat1/nslookup.0
  
  nslookup.0: nslookup.8
*** /usr/src/etc/named/tools/nslookup/pathnames.h.old	Mon Apr 26 08:38:33 1993
--- /usr/src/etc/named/tools/nslookup/pathnames.h	Mon Oct 21 21:45:19 1996
***************
*** 16,22 ****
   * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.1 (Berkeley) 5/28/90
   */
  
! #define	_PATH_HELPFILE	"/usr/lib/nslookup.help"
--- 16,22 ----
   * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.1.1 (2.11BSD) 1996/10/21
   */
  
! #define	_PATH_HELPFILE	"/usr/share/misc/nslookup.help"
*** /usr/src/etc/tcpd/README.old	Mon Jan 30 10:51:45 1995
--- /usr/src/etc/tcpd/README	Mon Oct 21 21:47:11 1996
***************
*** 961,972 ****
  listener, but it should be registered in the inetd configuration file.
  For example:
  
!     smtp    stream  tcp     nowait  root    /usr/etc/tcpd /usr/lib/sendmail -bs
  
  You will still need to run one sendmail background process to handle
  queued-up outgoing mail. A command like:
  
!     /usr/lib/sendmail -q15m
  
  (no `-bd' flag) should take care of that. You cannot really prevent
  people from posting forged mail this way, because there are many
--- 961,972 ----
  listener, but it should be registered in the inetd configuration file.
  For example:
  
!     smtp    stream  tcp     nowait  root    /usr/etc/tcpd /usr/sbin/sendmail -bs
  
  You will still need to run one sendmail background process to handle
  queued-up outgoing mail. A command like:
  
!     /usr/sbin/sendmail -q15m
  
  (no `-bd' flag) should take care of that. You cannot really prevent
  people from posting forged mail this way, because there are many
*** /usr/src/etc/tzone/Makefile.old	Sun Jan 28 01:03:48 1996
--- /usr/src/etc/tzone/Makefile	Sun Oct 27 21:56:06 1996
***************
*** 1,4 ****
! # @(#)Makefile	1.2 Makefile 196/1/28
  
  DESTDIR=
  
--- 1,4 ----
! # @(#)Makefile	1.3 Makefile 1996/10/27
  
  DESTDIR=
  
***************
*** 56,61 ****
--- 56,62 ----
  		./zic -d ${DESTDIR}/etc/zoneinfo -l $(LOCALTIME) $(DATA)
  		install -c -m 444 -o bin -g bin $(ZICMAN) ${DESTDIR}/usr/man/cat8
  		install -c -m 444 -o bin -g bin $(ZICMAN) ${DESTDIR}/usr/man/cat8
+ 		install -c -s -m 755 -o bin -g bin zic ${DESTDIR}/usr/sbin/zic
  
  zdump.0:	$(ZDUMANSRC)
  		/usr/man/manroff $(ZDUMANSRC) > $(ZDUMAN)
*** /usr/src/include/paths.h.old	Tue May 11 21:47:18 1993
--- /usr/src/include/paths.h	Mon Oct 21 19:50:59 1996
***************
*** 14,20 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3 (2.11BSD) 5/10/93
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
--- 14,20 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.6 (2.11BSD) 1996/10/21
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
***************
*** 21,29 ****
  #define	_PATH_CSHELL	"/bin/csh"
  #define	_PATH_CP	"/bin/cp"
  #define	_PATH_RSH	"/usr/ucb/rsh"
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_DEV	"/dev"
  #define	_PATH_LASTLOG	"/usr/adm/lastlog"
  #define	_PATH_TMP	"/tmp/"
  #define	_PATH_VARTMP	"/usr/tmp/"
! #define	_PATH_SENDMAIL	"/usr/lib/sendmail"
--- 21,35 ----
  #define	_PATH_CSHELL	"/bin/csh"
  #define	_PATH_CP	"/bin/cp"
  #define	_PATH_RSH	"/usr/ucb/rsh"
+ #define	_PATH_VI	"/usr/ucb/vi"
+ #define	_PATH_CONSOLE	"/dev/console"
+ #define	_PATH_DEVNULL	"/dev/null"
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_DEV	"/dev"
  #define	_PATH_LASTLOG	"/usr/adm/lastlog"
  #define	_PATH_TMP	"/tmp/"
  #define	_PATH_VARTMP	"/usr/tmp/"
! #define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
! #define	_PATH_DEVDB	"/var/run/dev"
! #define	_PATH_VARRUN	"/var/run/"
! #define	_PATH_CTIMED	"/usr/libexec/ctimed"
*** /usr/src/libexec/Makefile.old	Tue Jun 25 20:11:36 1996
--- /usr/src/libexec/Makefile	Thu Oct 24 21:16:39 1996
***************
*** 1,7 ****
  #
  # Steven Schultz - put in the public domain 1996/6/25.
  #
! #	@(#)Makefile	1.0 (2.11BSD) 1996/6/25
  #
  DESTDIR=
  CFLAGS=	-O
--- 1,7 ----
  #
  # Steven Schultz - put in the public domain 1996/6/25.
  #
! #	@(#)Makefile	1.1 (2.11BSD) 1996/10/24
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 8,14 ****
  SEPFLAG= -i
  TAGSFILE=tags
  
! SUBDIR=	ctimed
  
  all:	${SUBDIR}
  
--- 8,14 ----
  SEPFLAG= -i
  TAGSFILE=tags
  
! SUBDIR=	ctimed getNAME makekey
  
  all:	${SUBDIR}
  
*** /usr/src/local/Makefile.old	Tue Mar 26 21:50:43 1996
--- /usr/src/local/Makefile	Sat Oct 26 20:33:48 1996
***************
*** 1,5 ****
  #
! # 	#(@)Makefile	1.2	(2.11BSD) 1996/3/26
  #
  DESTDIR=
  CFLAGS=	-O
--- 1,5 ----
  #
! # 	#(@)Makefile	1.2.1	(2.11BSD) 1996/10/26
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 46,56 ****
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	-for i in ${STD} ${NSTD}; do \
  		(install $$i ${DESTDIR}/usr/local/$$i); done
- 	-chmod 2755 ${DESTDIR}/usr/local/trace
  	-chgrp kmem ${DESTDIR}/usr/local/trace
  #	-for i in ${SHELL}; do \
  #		(install -c -m 755 $$i.sh ${DESTDIR}/usr/local/$$i); done
! 	-sh /usr/src/usr.lib/makewhatis.sh ${MANDIR}
  
  clean:
  	rm -f a.out core *.s *.o
--- 46,56 ----
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	-for i in ${STD} ${NSTD}; do \
  		(install $$i ${DESTDIR}/usr/local/$$i); done
  	-chgrp kmem ${DESTDIR}/usr/local/trace
+ 	-chmod 2755 ${DESTDIR}/usr/local/trace
  #	-for i in ${SHELL}; do \
  #		(install -c -m 755 $$i.sh ${DESTDIR}/usr/local/$$i); done
! 	-sh /usr/sbin/makewhatis ${MANDIR}
  
  clean:
  	rm -f a.out core *.s *.o
*** /usr/src/man/man0/tocrc.old	Fri May 16 10:04:12 1986
--- /usr/src/man/man0/tocrc	Fri Oct 25 21:32:36 1996
***************
*** 4,10 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)tocrc	6.2 (Berkeley) 5/16/86
  #
  tmp=/tmp/toc$$
  trap "rm $tmp ; exit" 2 3 15
--- 4,10 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)tocrc	6.2.1 (2.11BSD) 1996/10/25
  #
  tmp=/tmp/toc$$
  trap "rm $tmp ; exit" 2 3 15
***************
*** 12,18 ****
  then
  	: create toc input files for section 3 only
  
! 	( cd ../man3 ; /usr/lib/getNAME -t `ls *.3 *.3[mnsxc] | sort` | sed \
  			-e 's/.s-2//g' \
  			-e 's/.s-1//g' \
  			-e 's/.s0//g' \
--- 12,18 ----
  then
  	: create toc input files for section 3 only
  
! 	(cd ../man3 ; /usr/libexec/getNAME -t `ls *.3 *.3[mnsxc] | sort` | sed \
  			-e 's/.s-2//g' \
  			-e 's/.s-1//g' \
  			-e 's/.s0//g' \
***************
*** 21,27 ****
  			-e 's/ *$/./' \
  			-e 's/.TH.*	//' \
  		> ../man0/tocx3 ;
! 		/usr/lib/getNAME -t *.3f | sed \
  			-e 's/.s-2//g' \
  			-e 's/.s-1//g' \
  			-e 's/.s0//g' \
--- 21,27 ----
  			-e 's/ *$/./' \
  			-e 's/.TH.*	//' \
  		> ../man0/tocx3 ;
! 		/usr/libexec/getNAME -t *.3f | sed \
  			-e 's/.s-2//g' \
  			-e 's/.s-1//g' \
  			-e 's/.s0//g' \
***************
*** 35,41 ****
  then
  	: create toc input file for one section only
  
! 	( cd ../man$1 ; /usr/lib/getNAME -t *.* |
  		sed \
  			-e 's/.s-2//g' \
  			-e 's/.s-1//g' \
--- 35,41 ----
  then
  	: create toc input file for one section only
  
! 	( cd ../man$1 ; /usr/libexec/getNAME -t *.* |
  		sed \
  			-e 's/.s-2//g' \
  			-e 's/.s-1//g' \
*** /usr/src/man/man1/Makefile.old	Fri Feb 23 20:42:35 1996
--- /usr/src/man/man1/Makefile	Fri Nov  1 20:38:21 1996
***************
*** 14,20 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	1.4 (2.11BSD) 1996/02/23
  #
  MDIR=	/usr/man/cat1
  SRCS=	adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \
--- 14,20 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	1.5 (2.11BSD) 1996/11/1
  #
  MDIR=	/usr/man/cat1
  SRCS=	adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \
***************
*** 30,36 ****
  	look.1 lookbib.1 lorder.1 lpq.1 lpr.1 lprm.1 lptest.1 ls.1 \
  	lxref.1 m4.1 mail.1 make.1 man.1 mesg.1 mkdep.1 mkdir.1 mkstr.1 \
  	more.1 mset.1 msgs.1 mt.1 mv.1 netstat.1 newaliases.1 nice.1 nm.1 
! SRCS1=	nroff.1 nslookup.1 od.1 pagesize.1 pc.1 pdx.1 pi.1 pix.1 \
  	plot.1 pmerge.1 pr.1 printenv.1 prof.1 ps.1 ptx.1 pwd.1 px.1 pxp.1 \
  	pxref.1 quota.1 ratfor.1 rcp.1 rdist.1 refer.1 rev.1 \
  	rlogin.1 rm.1 rmail.1 rmdir.1 roffbib.1 rsh.1 ruptime.1 rwho.1 \
--- 30,36 ----
  	look.1 lookbib.1 lorder.1 lpq.1 lpr.1 lprm.1 lptest.1 ls.1 \
  	lxref.1 m4.1 mail.1 make.1 man.1 mesg.1 mkdep.1 mkdir.1 mkstr.1 \
  	more.1 mset.1 msgs.1 mt.1 mv.1 netstat.1 newaliases.1 nice.1 nm.1 
! SRCS1=	nroff.1 nslookup.1 od.1 pagesize.1 pdx.1 pi.1 pix.1 \
  	plot.1 pmerge.1 pr.1 printenv.1 prof.1 ps.1 ptx.1 pwd.1 px.1 pxp.1 \
  	pxref.1 quota.1 ratfor.1 rcp.1 rdist.1 refer.1 rev.1 \
  	rlogin.1 rm.1 rmail.1 rmdir.1 roffbib.1 rsh.1 ruptime.1 rwho.1 \
***************
*** 37,43 ****
  	sccs.1 script.1 sed.1 sendbug.1 sh.1 size.1 sleep.1 soelim.1 \
  	sort.1 sortbib.1 spell.1 spline.1 split.1 strcompact.1 strings.1 \
  	strip.1 struct.1 stty.1 style.1 su.1 sum.1 symcompact.1 symorder.1 \
! 	sysline.1 tabs.1 tail.1 talk.1 \
  	tar.1 tbl.1 tc.1 tcopy.1 tee.1 telnet.1 time.1 \
  	tip.1 tk.1 tn3270.1 touch.1 tp.1 tr.1 troff.1 true.1 tset.1 \
  	tsort.1 tty.1 ul.1 unifdef.1 uniq.1 units.1 uptime.1 users.1 \
--- 37,43 ----
  	sccs.1 script.1 sed.1 sendbug.1 sh.1 size.1 sleep.1 soelim.1 \
  	sort.1 sortbib.1 spell.1 spline.1 split.1 strcompact.1 strings.1 \
  	strip.1 struct.1 stty.1 style.1 su.1 sum.1 symcompact.1 symorder.1 \
! 	tabs.1 tail.1 talk.1 \
  	tar.1 tbl.1 tc.1 tcopy.1 tee.1 telnet.1 time.1 \
  	tip.1 tk.1 tn3270.1 touch.1 tp.1 tr.1 troff.1 true.1 tset.1 \
  	tsort.1 tty.1 ul.1 unifdef.1 uniq.1 units.1 uptime.1 users.1 \
***************
*** 58,64 ****
  	look.0 lookbib.0 lorder.0 lpq.0 lpr.0 lprm.0 lptest.0 ls.0 \
  	lxref.0 m4.0 mail.0 make.0 man.0 mesg.0 mkdep.0 mkdir.0 mkstr.0 \
  	more.0 mset.0 msgs.0 mt.0 mv.0 netstat.0 newaliases.0 nice.0 nm.0
! OBJS2=	nroff.0 nslookup.0 od.0 pagesize.0 pc.0 pdx.0 pi.0 pix.0 \
  	plot.0 pmerge.0 pr.0 printenv.0 prof.0 ps.0 ptx.0 pwd.0 px.0 pxp.0 \
  	pxref.0 quota.0 ratfor.0 rcp.0 rdist.0 refer.0 rev.0 \
  	rlogin.0 rm.0 rmail.0 rmdir.0 roffbib.0 rsh.0 ruptime.0 rwho.0 \
--- 58,64 ----
  	look.0 lookbib.0 lorder.0 lpq.0 lpr.0 lprm.0 lptest.0 ls.0 \
  	lxref.0 m4.0 mail.0 make.0 man.0 mesg.0 mkdep.0 mkdir.0 mkstr.0 \
  	more.0 mset.0 msgs.0 mt.0 mv.0 netstat.0 newaliases.0 nice.0 nm.0
! OBJS2=	nroff.0 nslookup.0 od.0 pagesize.0 pdx.0 pi.0 pix.0 \
  	plot.0 pmerge.0 pr.0 printenv.0 prof.0 ps.0 ptx.0 pwd.0 px.0 pxp.0 \
  	pxref.0 quota.0 ratfor.0 rcp.0 rdist.0 refer.0 rev.0 \
  	rlogin.0 rm.0 rmail.0 rmdir.0 roffbib.0 rsh.0 ruptime.0 rwho.0 \
***************
*** 65,71 ****
  	sccs.0 script.0 sed.0 sendbug.0 sh.0 size.0 sleep.0 soelim.0 \
  	sort.0 sortbib.0 spell.0 spline.0 split.0 strcompact.0 strings.0 \
  	strip.0 struct.0 stty.0 style.0 su.0 sum.0 symcompact.0 symorder.0 \
! 	sysline.0 tabs.0 tail.0 talk.0 \
  	tar.0 tbl.0 tc.0 tcopy.0 tee.0 telnet.0 time.0 \
  	tip.0 tk.0 tn3270.0 touch.0 tp.0 tr.0 troff.0 true.0 tset.0 \
  	tsort.0 tty.0 ul.0 unifdef.0 uniq.0 units.0 uptime.0 users.0 \
--- 65,71 ----
  	sccs.0 script.0 sed.0 sendbug.0 sh.0 size.0 sleep.0 soelim.0 \
  	sort.0 sortbib.0 spell.0 spline.0 split.0 strcompact.0 strings.0 \
  	strip.0 struct.0 stty.0 style.0 su.0 sum.0 symcompact.0 symorder.0 \
! 	tabs.0 tail.0 talk.0 \
  	tar.0 tbl.0 tc.0 tcopy.0 tee.0 telnet.0 time.0 \
  	tip.0 tk.0 tn3270.0 touch.0 tp.0 tr.0 troff.0 true.0 tset.0 \
  	tsort.0 tty.0 ul.0 unifdef.0 uniq.0 units.0 uptime.0 users.0 \
*** /usr/src/man/man1/adb.1.old	Tue Aug  4 22:20:03 1987
--- /usr/src/man/man1/adb.1	Mon Oct 21 21:50:52 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)adb.1	6.1 (Berkeley) 8/4/87
  .\"
! .TH ADB 1 "August 4, 1987"
  .UC 2
  .SH NAME
  adb \- debugger (2BSD)
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)adb.1	6.1.1 (2.11BSD) 1996/10/21
  .\"
! .TH ADB 1 "October 21, 1996"
  .UC 2
  .SH NAME
  adb \- debugger (2BSD)
***************
*** 59,65 ****
  .PP
  The \fB\-I\fP option specifies a directory where files to be read
  with $< or $<< (see below) will be sought; the default is
! .IR /usr/lib/adb .
  .PP
  .I Adb
  ignores QUIT; INTERRUPT causes return to the next
--- 59,65 ----
  .PP
  The \fB\-I\fP option specifies a directory where files to be read
  with $< or $<< (see below) will be sought; the default is
! .IR /usr/share/adb .
  .PP
  .I Adb
  ignores QUIT; INTERRUPT causes return to the next
*** /usr/src/man/man1/at.1.old	Sun Dec 14 15:06:06 1986
--- /usr/src/man/man1/at.1	Mon Oct 21 21:52:40 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)at.1	6.2 (Berkeley) 3/20/86
  .\"
! .TH AT 1 "March 20, 1986"
  .UC 4
  .SH NAME
  at \- execute commands at a later time
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)at.1	6.2.1 (2.11BSD) 1996/10/21
  .\"
! .TH AT 1 "October 21, 1996"
  .UC 4
  .SH NAME
  at \- execute commands at a later time
***************
*** 88,94 ****
  programs are executed by periodic execution 
  of the command 
  .IR
! /usr/lib/atrun 
  from 
  .IR cron (8).
  The granularity of
--- 88,94 ----
  programs are executed by periodic execution 
  of the command 
  .IR
! /usr/libexec/atrun 
  from 
  .IR cron (8).
  The granularity of
***************
*** 106,112 ****
  /usr/spool/at/yy.ddd.hhhh.*  job file
  /usr/spool/at/past           directory where jobs are executed from
  /usr/spool/at/lasttimedone   last time atrun was run
! /usr/lib/atrun               executor (run by cron(8))
  .fi
  .SH "SEE ALSO"
  atq(1),
--- 106,112 ----
  /usr/spool/at/yy.ddd.hhhh.*  job file
  /usr/spool/at/past           directory where jobs are executed from
  /usr/spool/at/lasttimedone   last time atrun was run
! /usr/libexec/atrun               executor (run by cron(8))
  .fi
  .SH "SEE ALSO"
  atq(1),
***************
*** 118,124 ****
  Complains about various syntax errors and times out of range.
  .SH BUGS
  Due to the granularity of the execution of
! .IR /usr/lib/atrun,
  there may be bugs in scheduling things almost
  exactly 24 hours into the future.
  
--- 118,124 ----
  Complains about various syntax errors and times out of range.
  .SH BUGS
  Due to the granularity of the execution of
! .IR /usr/libexec/atrun,
  there may be bugs in scheduling things almost
  exactly 24 hours into the future.
  
*** /usr/src/man/man1/bc.1.old	Sun Dec 14 15:06:18 1986
--- /usr/src/man/man1/bc.1	Mon Oct 21 21:58:25 1996
***************
*** 1,6 ****
! .\"	@(#)bc.1	6.1 (Berkeley) 4/29/85
  .\"
! .TH BC 1 "April 29, 1985"
  .AT 3
  .SH NAME
  bc \- arbitrary-precision arithmetic language
--- 1,6 ----
! .\"	@(#)bc.1	6.1.1 (2.11BSD) 1996/10/21
  .\"
! .TH BC 1 "October 21, 1996"
  .AT 3
  .SH NAME
  bc \- arbitrary-precision arithmetic language
***************
*** 176,183 ****
  .I dc
  input is sent to the standard output instead.
  .SH FILES
! .ta \w'/usr/lib/lib.b 'u
! /usr/lib/lib.b	mathematical library
  .br
  dc(1)	desk calculator proper
  .SH "SEE ALSO"
--- 176,183 ----
  .I dc
  input is sent to the standard output instead.
  .SH FILES
! .ta \w'/usr/share/misc/lib.b 'u
! /usr/share/misc/lib.b	mathematical library
  .br
  dc(1)	desk calculator proper
  .SH "SEE ALSO"
*** /usr/src/man/man1/calendar.1.old	Sun Dec 14 15:06:34 1986
--- /usr/src/man/man1/calendar.1	Mon Oct 21 21:59:22 1996
***************
*** 1,6 ****
! .\"	@(#)calendar.1	6.1 (Berkeley) 4/29/85
  .\"
! .TH CALENDAR 1 "April 29, 1985"
  .AT 3
  .SH NAME
  calendar \- reminder service
--- 1,6 ----
! .\"	@(#)calendar.1	6.1.1 (2.11BSD) 1996/10/21
  .\"
! .TH CALENDAR 1 "October 21, 1996"
  .AT 3
  .SH NAME
  calendar \- reminder service
***************
*** 38,44 ****
  .SH FILES
  calendar
  .br
! /usr/lib/calendar to figure out today's and tomorrow's dates
  .br
  /etc/passwd
  .br
--- 38,44 ----
  .SH FILES
  calendar
  .br
! /usr/libexec/calendar to figure out today's and tomorrow's dates
  .br
  /etc/passwd
  .br
*** /usr/src/man/man1/diff.1.old	Sun Dec 14 15:06:08 1986
--- /usr/src/man/man1/diff.1	Mon Oct 21 22:00:30 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)diff.1	6.4 (Berkeley) 5/19/86
  .\"
! .TH DIFF 1 "May 19, 1986"
  .UC 4
  .SH NAME
  diff \- differential file and directory comparator
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)diff.1	6.4.1 (2.11BSD) 1996/10/21
  .\"
! .TH DIFF 1 "October 21, 1996"
  .UC 4
  .SH NAME
  diff \- differential file and directory comparator
***************
*** 260,266 ****
  .SH FILES
  /tmp/d?????
  .br
! /usr/lib/diffh for 
  .B \-h
  .br
  /bin/diff for directory diffs
--- 260,266 ----
  .SH FILES
  /tmp/d?????
  .br
! /usr/libexec/diffh for 
  .B \-h
  .br
  /bin/diff for directory diffs
*** /usr/src/man/man1/diff3.1.old	Sun Dec 14 15:06:20 1986
--- /usr/src/man/man1/diff3.1	Mon Oct 21 22:01:20 1996
***************
*** 1,6 ****
! .\"	@(#)diff3.1	6.2 (Berkeley) 8/20/85
  .\"
! .TH DIFF3 1 "August 20, 1985"
  .AT 3
  .SH NAME
  diff3 \- 3-way differential file comparison
--- 1,6 ----
! .\"	@(#)diff3.1	6.2.1 (2.11BSD) 1996/10/21
  .\"
! .TH DIFF3 1 "October 21, 1996"
  .AT 3
  .SH NAME
  diff3 \- 3-way differential file comparison
***************
*** 131,137 ****
  .SH FILES
  /tmp/d3?????
  .br
! /usr/lib/diff3
  .SH "SEE ALSO"
  diff(1)
  .SH BUGS
--- 131,137 ----
  .SH FILES
  /tmp/d3?????
  .br
! /usr/libexec/diff3
  .SH "SEE ALSO"
  diff(1)
  .SH BUGS
*** /usr/src/man/man1/error.1.old	Sun Dec 14 15:06:08 1986
--- /usr/src/man/man1/error.1	Mon Oct 21 22:03:43 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)error.1	6.2 (Berkeley) 5/5/86
  .\"
! .TH ERROR 1 "May 5, 1986"
  .UC 4
  .SH NAME
  error \- analyze and disperse compiler error messages
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)error.1	6.2.1 (2.11BSD) 1996/10/21
  .\"
! .TH ERROR 1 "October 21, 1996"
  .UC 4
  .SH NAME
  error \- analyze and disperse compiler error messages
***************
*** 133,141 ****
  that refer to one of the two
  .I lint
  libraries,
! .I /usr/lib/llib-lc
  and
! .I /usr/lib/llib-port
  are discarded,
  to prevent accidently touching these libraries.
  Again, these error messages are consumed entirely by
--- 133,141 ----
  that refer to one of the two
  .I lint
  libraries,
! .I /usr/share/lint/llib-lc
  and
! .I /usr/share/lint/llib-port
  are discarded,
  to prevent accidently touching these libraries.
  Again, these error messages are consumed entirely by
*** /usr/src/man/man1/ex.1.old	Sun Dec 14 15:06:08 1986
--- /usr/src/man/man1/ex.1	Mon Oct 21 22:05:53 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ex.1	6.4 (Berkeley) 6/5/86
  .\"
! .TH EX 1 "June 5, 1986"
  .UC 4
  .SH NAME
  ex, edit \- text editor
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ex.1	6.4.1 (2.11BSD) 1996/10/21
  .\"
! .TH EX 1 "October 21, 1996"
  .UC 4
  .SH NAME
  ex, edit \- text editor
***************
*** 97,107 ****
  .I Introduction.
  .SH FILES
  .DT
! /usr/lib/ex?.?strings		error messages
  .br
! /usr/lib/ex?.?recover		recover command
  .br
! /usr/lib/ex?.?preserve		preserve command
  .br
  /etc/termcap			describes capabilities of terminals
  .br
--- 97,107 ----
  .I Introduction.
  .SH FILES
  .DT
! /usr/share/misc/exstrings		error messages
  .br
! /usr/libexec/exrecover		recover command
  .br
! /usr/sbin/expreserve		preserve command
  .br
  /etc/termcap			describes capabilities of terminals
  .br
*** /usr/src/man/man1/f77.1.old	Sun Jun 12 15:41:36 1988
--- /usr/src/man/man1/f77.1	Mon Oct 21 22:09:11 1996
***************
*** 126,140 ****
  file.o	object file
  a.out	loaded output
  ./fort[pid].?	temporary
! /usr/lib/f77pass1	compiler pass 1
  /lib/c1	compiler pass 2
  /lib/c2	optional optimizer
  /usr/lib/libF77.a	intrinsic function library
- /usr/lib/libovF77.a	intrinsic function library (for overlays)
  /usr/lib/libI77.a	Fortran I/O library
- /usr/lib/libovI77.a	Fortran I/O library (for overlays)
  /usr/lib/libU77.a	Fortran system call library
- /usr/lib/libovU77.a	Fortran system call library (for overlays)
  /lib/libc.a	C library, see section 3
  /temp/fortPID.[xsad SopzA]	temporary files
  .fi
--- 126,137 ----
  file.o	object file
  a.out	loaded output
  ./fort[pid].?	temporary
! /usr/libexec/f77pass1	compiler pass 1
  /lib/c1	compiler pass 2
  /lib/c2	optional optimizer
  /usr/lib/libF77.a	intrinsic function library
  /usr/lib/libI77.a	Fortran I/O library
  /usr/lib/libU77.a	Fortran system call library
  /lib/libc.a	C library, see section 3
  /temp/fortPID.[xsad SopzA]	temporary files
  .fi
*** /usr/src/man/man1/find.1.old	Sun Dec 14 15:06:20 1986
--- /usr/src/man/man1/find.1	Tue Oct 22 19:35:25 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)find.1	6.3 (Berkeley) 5/11/86
  .\"
! .TH FIND 1 "May 11, 1986"
  .AT 3
  .SH NAME
  find \- find files
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)find.1	6.3.1 (2.11BSD) 1996/10/22
  .\"
! .TH FIND 1 "October 11, 1996"
  .AT 3
  .SH NAME
  find \- find files
***************
*** 248,257 ****
  find / \e( \-name a.out \-o \-name '*.o' \e) \-atime +7 \-exec rm {} \e\;
  .SH FILES
  .nf
! .ta \w'/usr/lib/find/find.codes     'u
  /etc/passwd
  /etc/group
! /usr/lib/find/find.codes	coded pathnames database
  .fi
  .SH "SEE ALSO"
  sh(1), test(1), fs(5)
--- 248,257 ----
  find / \e( \-name a.out \-o \-name '*.o' \e) \-atime +7 \-exec rm {} \e\;
  .SH FILES
  .nf
! .ta \w'/var/db/find.codes     'u
  /etc/passwd
  /etc/group
! /var/db/find.codes	coded pathnames database
  .fi
  .SH "SEE ALSO"
  sh(1), test(1), fs(5)
*** /usr/src/man/man1/learn.1.old	Sun Dec 14 15:06:21 1986
--- /usr/src/man/man1/learn.1	Tue Oct 22 19:52:12 1996
***************
*** 1,6 ****
! .\"	@(#)learn.1	6.2 (Berkeley) 5/15/86
  .\"
! .TH LEARN 1 "May 15, 1986"
  .AT 3
  .SH NAME
  learn \- computer aided instruction about UNIX
--- 1,6 ----
! .\"	@(#)learn.1	6.2.1 (2.11BSD) 1996/10/22
  .\"
! .TH LEARN 1 "October 22, 1996"
  .AT 3
  .SH NAME
  learn \- computer aided instruction about UNIX
***************
*** 86,92 ****
  option allows one to exercise a script in
  a nonstandard place.
  .SH FILES
! /usr/lib/learn	subtree for all dependent directories and files
  .br
  /usr/tmp/pl\(**	playpen directories
  .br
--- 86,92 ----
  option allows one to exercise a script in
  a nonstandard place.
  .SH FILES
! /usr/share/learn	subtree for all dependent directories and files
  .br
  /usr/tmp/pl\(**	playpen directories
  .br
*** /usr/src/man/man1/lint.1.old	Sun Dec 14 15:06:10 1986
--- /usr/src/man/man1/lint.1	Tue Oct 22 19:56:28 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)lint.1	6.2 (Berkeley) 3/17/86
  .\"
! .TH LINT 1 "March 17, 1986"
  .UC 4
  .SH NAME
  lint \- a C program verifier
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)lint.1	6.2.1 (2.11BSD) 1996/10/22
  .\"
! .TH LINT 1 "October 22, 1996"
  .UC 4
  .SH NAME
  lint \- a C program verifier
***************
*** 160,175 ****
  .SH AUTHOR
  S.C. Johnson.  Lint library construction implemented by Edward Wang.
  .SH FILES
! .ta \w'/usr/lib/lint/llib-port.ln  'u
! /usr/lib/lint/lint[12]	programs
  .br
! /usr/lib/lint/llib-lc.ln	declarations for standard functions
  .br
! /usr/lib/lint/llib-lc	human readable version of above
  .br
! /usr/lib/lint/llib-port.ln	declarations for portable functions
  .br
! /usr/lib/lint/llib-port	human readable . . .
  .br
  llib-l*.ln	library created with
  .B \-C
--- 160,175 ----
  .SH AUTHOR
  S.C. Johnson.  Lint library construction implemented by Edward Wang.
  .SH FILES
! .ta \w'/usr/share/lint/llib-port.ln  'u
! /usr/libexec/lint/lint[12]	programs
  .br
! /usr/share/lint/llib-lc.ln	declarations for standard functions
  .br
! /usr/share/lint/llib-lc	human readable version of above
  .br
! /usr/share/lint/llib-port.ln	declarations for portable functions
  .br
! /usr/share/lint/llib-port	human readable . . .
  .br
  llib-l*.ln	library created with
  .B \-C