*BSD News Article 82557


Return to BSD News archive

#! rnews 61756 bsd
Newsgroups: comp.bugs.2bsd
Path: euryale.cc.adfa.oz.au!newshost.carno.net.au!harbinger.cc.monash.edu.au!munnari.OZ.AU!news.ecn.uoknor.edu!news.cis.okstate.edu!nntp.ksu.edu!news.physics.uiowa.edu!math.ohio-state.edu!cs.utexas.edu!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 (#341 - 7 of 8)
Organization: 2BSD, Simi Valley CA USA
Message-ID: <E0LGJr.M42@moe.2bsd.com>
Date: Sat, 9 Nov 1996 08:21:27 GMT
Lines: 2136

Subject: The Grand Reorganization Begins (#341 - 7 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 #341 (part 7 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/341--------------------
*** /usr/src/usr.bin/find/Makefile.old	Mon Feb 16 17:10:39 1987
--- /usr/src/usr.bin/find/Makefile	Wed Oct 23 20:27:29 1996
***************
*** 1,8 ****
! #	@(#)Makefile	4.3	(Berkeley)	85/06/01
  #
  DESTDIR=
  CFLAGS=	-O
- LFLAGS=	
  SEPFLAG= -i
  
  # The programs themselves
--- 1,7 ----
! #	@(#)Makefile	4.3.1	(2.11BSD)	1996/10/23
  #
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG= -i
  
  # The programs themselves
***************
*** 16,70 ****
  
  all: ${PROG} ${LIBS}
  
! find: find.c
! 	cc ${SEPFLAG} ${CFLAGS} -o find find.c
  
! bigram: bigram.c
! 	cc ${SEPFLAG} ${CFLAGS} -o bigram bigram.c
  
! code: code.c
! 	cc ${SEPFLAG} ${CFLAGS} -o code code.c
  
  install: ${PROG} ${LIBS}
! 	install -s ${PROG} ${DESTDIR}/usr/bin/${PROG}
! 	-mkdir ${DESTDIR}/usr/lib/find
! 	install -s bigram ${DESTDIR}/usr/lib/find/bigram
! 	install -s code ${DESTDIR}/usr/lib/find/code
! 	install -c -m 755 updatedb.csh ${DESTDIR}/usr/lib/find/updatedb
  
  clean:
! 	rm -f a.out core ${LIBS} ${PROG}
  
  depend:
! 	cat </dev/null >x.c
! 	for i in ${SRCS}; do \
! 		(echo `basename $$i .c`.o: $$i >>makedep; \
! 		/bin/grep '^#[ 	]*include' x.c $$i | sed \
! 			-e 's,<\(.*\)>,"/usr/include/\1",' \
! 			-e 's/:[^"]*"\([^"]*\)".*/: \1/' \
! 			-e 's/\.c/.o/' >>makedep); done
! 	echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
! 	echo '$$r makedep' >>eddep
! 	echo 'w' >>eddep
! 	cp Makefile Makefile.bak
! 	ed - Makefile < eddep
! 	rm eddep makedep x.c
! 	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
! 	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
! 	echo '# see make depend above' >> Makefile
! 
! # DO NOT DELETE THIS LINE -- make depend uses it
! 
! find.o: find.c
! find.o: /usr/include/stdio.h
! find.o: /usr/include/sys/param.h
! find.o: /usr/include/sys/dir.h
! find.o: /usr/include/sys/stat.h
! find.o: /usr/include/signal.h
! bigram.o: bigram.c
! bigram.o: /usr/include/stdio.h
! code.o: code.c
! code.o: /usr/include/stdio.h
! # DEPENDENCIES MUST END AT END OF FILE
! # IF YOU PUT STUFF HERE IT WILL GO AWAY
! # see make depend above
--- 15,40 ----
  
  all: ${PROG} ${LIBS}
  
! find: find.o
! 	cc ${SEPFLAG} ${CFLAGS} -o find find.o
  
! bigram: bigram.o
! 	cc ${SEPFLAG} ${CFLAGS} -o bigram bigram.o
  
! code: code.o
! 	cc ${SEPFLAG} ${CFLAGS} -o code code.o
  
  install: ${PROG} ${LIBS}
! 	install -s -m 755 ${PROG} ${DESTDIR}/usr/bin/${PROG}
! 	-mkdir ${DESTDIR}/var/db ${DESTDIR}/usr/libexec/find
! 	chmod 755 ${DESTDIR}/usr/libexec/find ${DESTDIR}/var/db
! 	install -s -m 755 bigram ${DESTDIR}/usr/libexec/find/bigram
! 	install -s -m 755 code ${DESTDIR}/usr/libexec/find/code
! 	install -c -m 755 updatedb.csh ${DESTDIR}/usr/libexec/find/updatedb
  
  clean:
! 	rm -f *.o a.out core ${LIBS} ${PROG}
  
  depend:
! 	chmod u+w Makefile
! 	mkdep ${CFLAGS} ${SRCS}
*** /usr/src/usr.bin/find/find.c.old	Thu Apr 21 22:38:47 1994
--- /usr/src/usr.bin/find/find.c	Fri Nov  1 19:30:08 1996
***************
*** 1,5 ****
  #if	defined(DOSCCS) && !defined(lint)
! static char *sccsid = "@(#)find.c	4.17.2 (2.11BSD GTE) 4/21/94";
  #endif
  
  #include <stdio.h>
--- 1,5 ----
  #if	defined(DOSCCS) && !defined(lint)
! static char *sccsid = "@(#)find.c	4.17.3 (2.11BSD GTE) 1996/10/23";
  #endif
  
  #include <stdio.h>
***************
*** 59,65 ****
   *		NASA Ames Research Center, 6/81.
   *
   *		The second form searches a pre-computed filelist
!  *		(constructed nightly by /usr/lib/crontab) which is
   *		compressed by updatedb (v.i.z.)  The effect of
   *			find <name>
   *		is similar to
--- 59,65 ----
   *		NASA Ames Research Center, 6/81.
   *
   *		The second form searches a pre-computed filelist
!  *		(constructed nightly by 'cron') which is
   *		compressed by updatedb (v.i.z.)  The effect of
   *			find <name>
   *		is similar to
***************
*** 817,823 ****
   * provided in the standard 'find'.
   */
  
! #define	FCODES 	"/usr/lib/find/find.codes"
  #define	YES	1
  #define	NO	0
  #define	OFFSET	14
--- 817,823 ----
   * provided in the standard 'find'.
   */
  
! #define	FCODES 	"/var/db/find.codes"
  #define	YES	1
  #define	NO	0
  #define	OFFSET	14
*** /usr/src/usr.bin/find/updatedb.csh.old	Mon Feb 16 16:22:18 1987
--- /usr/src/usr.bin/find/updatedb.csh	Wed Oct 23 20:33:33 1996
***************
*** 1,11 ****
  #!/bin/csh -f
  #
! #	@(#)updatedb.csh	4.6	(Berkeley)	85/04/22
  #
  set SRCHPATHS = "/"			# directories to be put in the database
! set LIBDIR = /usr/lib/find		# for subprograms
  set FINDHONCHO = root			# for error messages
! set FCODES = /usr/lib/find/find.codes	# the database 
  
  set path = ( $LIBDIR /usr/ucb /bin /usr/bin )
  set bigrams = /tmp/f.bigrams$$
--- 1,11 ----
  #!/bin/csh -f
  #
! #	@(#)updatedb.csh	4.6.1	(2.11BSD)	1996/10/23
  #
  set SRCHPATHS = "/"			# directories to be put in the database
! set LIBDIR = /usr/libexec/find		# for subprograms
  set FINDHONCHO = root			# for error messages
! set FCODES = /var/db/find.codes		# the database 
  
  set path = ( $LIBDIR /usr/ucb /bin /usr/bin )
  set bigrams = /tmp/f.bigrams$$
*** /usr/src/usr.bin/learn/Makefile.old	Sun Jan 28 20:04:38 1996
--- /usr/src/usr.bin/learn/Makefile	Thu Oct 24 19:29:02 1996
***************
*** 3,15 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.6.1	(2.11BSD)	1996/1/28
  #
  # Flag BSD4_2 means 4.2 or later.
! CFLAGS=	-O -DBSD4_2
  SEPFLAG=-i
! LIBC=	/lib/libc.a
! LLIB=	${DESTDIR}/usr/lib/learn/bin
  SRCS=	copy.c dounit.c getlesson.c learn.c list.c mem.c makpipe.c maktee.c \
  	mysys.c selsub.c selunit.c start.c whatnow.c wrapup.c
  OBJS=	copy.o dounit.o getlesson.o learn.o list.o mem.o makpipe.o maktee.o \
--- 3,14 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.6.2	(2.11BSD)	1996/10/23
  #
  # Flag BSD4_2 means 4.2 or later.
! CFLAGS=	-O -DBSD4_2 -DLOGDIR=\"/var/log/learn\"
  SEPFLAG=-i
! LLIB=	${DESTDIR}/usr/share/learn/bin
  SRCS=	copy.c dounit.c getlesson.c learn.c list.c mem.c makpipe.c maktee.c \
  	mysys.c selsub.c selunit.c start.c whatnow.c wrapup.c
  OBJS=	copy.o dounit.o getlesson.o learn.o list.o mem.o makpipe.o maktee.o \
***************
*** 17,29 ****
  
  all: learn lrntee lcount
  
! learn: ${OBJS} ${LIBC}
  	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
! lcount: lcount.o ${LIBC}
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ lcount.o
  
! lrntee: lrntee.o ${LIBC}
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ lrntee.o
  
  clean: FRC
--- 16,28 ----
  
  all: learn lrntee lcount
  
! learn: ${OBJS}
  	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
! lcount: lcount.o
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ lcount.o
  
! lrntee: lrntee.o
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ lrntee.o
  
  clean: FRC
***************
*** 30,38 ****
--- 29,40 ----
  	rm -f *.o core learn lrntee lcount
  
  depend: FRC
+ 	chmod u+w Makefile
  	mkdep ${CFLAGS} ${SRCS} lcount.c lrntee.c
  
  install: all
+ 	-mkdir ${DESTDIR}/${LLIB}
+ 	chmod 755 ${DESTDIR}/${LLIB}
  	install -c -s -m 755 learn ${DESTDIR}/usr/bin/learn
  	install -s -m 755 learn ${LLIB}/learn
  	install -s -m 755 lrntee ${LLIB}/lrntee
*** /usr/src/usr.bin/learn/README.old	Thu May 15 17:59:09 1986
--- /usr/src/usr.bin/learn/README	Wed Oct 23 20:48:52 1996
***************
*** 6,18 ****
  	the documented and dubious "hint" command.  Miscellaneous typos.
  
  Note that play directories are created in /tmp, no longer
! in /usr/lib/learn/play.  The C script is not complete;
  use at your own risk.  The editor script still smacks of ed.
  
  Lessons are in (vi lessons are on user-contributed-software tape)
! 	/usr/lib/learn/*
  and auxilliary programs are in
! 	/usr/lib/learn/bin
  
  Make a learn by
  	make
--- 6,18 ----
  	the documented and dubious "hint" command.  Miscellaneous typos.
  
  Note that play directories are created in /tmp, no longer
! in /usr/share/learn/play.  The C script is not complete;
  use at your own risk.  The editor script still smacks of ed.
  
  Lessons are in (vi lessons are on user-contributed-software tape)
! 	/usr/share/learn/*
  and auxilliary programs are in
! 	/usr/share/learn/bin
  
  Make a learn by
  	make
*** /usr/src/usr.bin/learn/copy.c.old	Thu May 15 17:59:10 1986
--- /usr/src/usr.bin/learn/copy.c	Thu Oct 24 19:31:41 1996
***************
*** 1,6 ****
! #ifndef lint
! static char sccsid[] = "@(#)copy.c	4.3	(Berkeley)	5/15/86";
! #endif not lint
  
  #include "stdio.h"
  #include "signal.h"
--- 1,6 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)copy.c	4.3.1	(2.11BSD)	1996/10/23";
! #endif
  
  #include "stdio.h"
  #include "signal.h"
***************
*** 210,216 ****
  			if (!logging)
  				break;
  			if (logf[0] == 0)
! 				sprintf(logf, "%s/log/%s", direct, sname);
  			f = fopen((r ? r : logf), "a");
  			if (f == NULL)
  				break;
--- 210,216 ----
  			if (!logging)
  				break;
  			if (logf[0] == 0)
! 				sprintf(logf, "%s/%s", LOGDIR, sname);
  			f = fopen((r ? r : logf), "a");
  			if (f == NULL)
  				break;
*** /usr/src/usr.bin/learn/learn.c.old	Thu May 15 17:59:11 1986
--- /usr/src/usr.bin/learn/learn.c	Wed Oct 23 20:50:14 1996
***************
*** 1,12 ****
! #ifndef lint
! static char sccsid[] = "@(#)learn.c	4.4	(Berkeley)	5/15/86";
! #endif not lint
  
  #include "stdio.h"
  #include "lrnref.h"
  #include "signal.h"
  
! char	*direct	= "/usr/lib/learn";	/* CHANGE THIS ON YOUR SYSTEM */
  int	more;
  char	*level;
  int	speed;
--- 1,12 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)learn.c	4.4.1	(2.11BSD)	1996/10/23";
! #endif
  
  #include "stdio.h"
  #include "lrnref.h"
  #include "signal.h"
  
! char	*direct	= "/usr/share/learn";	/* CHANGE THIS ON YOUR SYSTEM */
  int	more;
  char	*level;
  int	speed;
*** /usr/src/usr.bin/lex/Makefile.old	Mon Mar 16 19:00:52 1987
--- /usr/src/usr.bin/lex/Makefile	Wed Oct 23 20:54:42 1996
***************
*** 1,4 ****
! #	Makefile	4.1	83/08/11
  #
  CFLAGS = -O
  SEPFLAG= -i
--- 1,4 ----
! #	Makefile	4.1.1 (2.11BSD)	1996/10/23
  #
  CFLAGS = -O
  SEPFLAG= -i
***************
*** 6,31 ****
  all: lex
  
  lex: lmain.o y.tab.o sub1.o sub2.o header.o
! 	-if [ X${SEPFLAG} = X-i ]; then \
! 		cc ${SEPFLAG} lmain.o y.tab.o sub1.o sub2.o header.o -o lex; \
! 	else \
! 		ld ${SEPFLAG} -X /lib/crt0.o \
! 		-Z lmain.o y.tab.o \
! 		-Z sub2.o \
! 		-Z header.o \
! 		-Y sub1.o -lc -o lex; \
! 	fi
  
  smallex:
! 	-if [ X${SEPFLAG} = X-i ]; then \
! 		cc ${SEPFLAG} lmain.o y.tab.o sub1.o sub2.o header.o -o lex; \
! 	else \
! 		ld ${SEPFLAG} -X /lib/crt0.o \
! 		-Z lmain.o y.tab.o \
! 		-Z sub2.o \
! 		-Z header.o \
! 		-Y sub1.o -lc -o lex; \
! 	fi
  
  y.tab.c: parser.y
  	yacc parser.y
--- 6,15 ----
  all: lex
  
  lex: lmain.o y.tab.o sub1.o sub2.o header.o
! 	cc ${SEPFLAG} lmain.o y.tab.o sub1.o sub2.o header.o -o lex
  
  smallex:
! 	cc ${SEPFLAG} lmain.o y.tab.o sub1.o sub2.o header.o -o lex
  
  y.tab.c: parser.y
  	yacc parser.y
***************
*** 39,47 ****
  	cc -c -O header.c
  
  install: all
! 	install -s lex $(DESTDIR)/usr/bin
! 	install -c ncform $(DESTDIR)/usr/lib/lex
! 	install -c nrform $(DESTDIR)/usr/lib/lex
  
  clean:
  	rm -f *.o lex y.tab.c
--- 23,33 ----
  	cc -c -O header.c
  
  install: all
! 	-mkdir -p ${DESTDIR}/usr/libdata/lex
! 	chmod 755 ${DESTDIR}/usr/libdata/lex
! 	install -s -m 755 lex $(DESTDIR)/usr/bin
! 	install -c -m 444 ncform $(DESTDIR)/usr/libdata/lex
! 	install -c -m 444 nrform $(DESTDIR)/usr/libdata/lex
  
  clean:
  	rm -f *.o lex y.tab.c
*** /usr/src/usr.bin/lex/lmain.c.old	Mon Feb 16 16:21:51 1987
--- /usr/src/usr.bin/lex/lmain.c	Wed Oct 23 20:56:09 1996
***************
*** 1,5 ****
! #ifndef lint
! static char sccsid[] = "@(#)lmain.c	4.3 (Berkeley) 2/21/85";
  #endif
  
  # include "ldefs.c"
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)lmain.c	4.3.1 (2.11BSD) 1996/10/23";
  #endif
  
  # include "ldefs.c"
***************
*** 100,106 ****
  # ifdef DEBUG
  	free3core();
  # endif
! 	if (ZCH>NCH) cname="/usr/lib/lex/ebcform";
  	fother = fopen(ratfor?ratname:cname,"r");
  	if(fother == NULL)
  		error("Lex driver missing, file %s",ratfor?ratname:cname);
--- 100,106 ----
  # ifdef DEBUG
  	free3core();
  # endif
! 	if (ZCH>NCH) cname="/usr/libdata/lex/ebcform";
  	fother = fopen(ratfor?ratname:cname,"r");
  	if(fother == NULL)
  		error("Lex driver missing, file %s",ratfor?ratname:cname);
*** /usr/src/usr.bin/lex/once.c.old	Mon Feb 16 16:21:52 1987
--- /usr/src/usr.bin/lex/once.c	Wed Oct 23 20:56:59 1996
***************
*** 1,4 ****
! /*	once.c	4.1	83/08/11	*/
  	/* because of external definitions, this code should occur only once */
  # ifdef ASCII
  int ctable[2*NCH] = {
--- 1,4 ----
! /*	once.c	4.1.1 (2.11BSD)	1996/10/23 */
  	/* because of external definitions, this code should occur only once */
  # ifdef ASCII
  int ctable[2*NCH] = {
***************
*** 55,62 ****
  char *slptr = slist;
  
  # if (unix || ibm)
! char *cname = "/usr/lib/lex/ncform";
! char *ratname = "/usr/lib/lex/nrform";
  # endif
  
  # ifdef gcos
--- 55,62 ----
  char *slptr = slist;
  
  # if (unix || ibm)
! char *cname = "/usr/libdata/lex/ncform";
! char *ratname = "/usr/libdata/lex/nrform";
  # endif
  
  # ifdef gcos
*** /usr/src/usr.bin/lint/Makefile.old	Tue Jan 17 19:40:30 1995
--- /usr/src/usr.bin/lint/Makefile	Wed Oct 23 21:01:23 1996
***************
*** 1,5 ****
  #
! #	@(#)Makefile	1.14	(2.11BSD GTE)	1/17/95
  #
  M=/usr/src/lib/mip
  P=/usr/src/lib/pcc
--- 1,5 ----
  #
! #	@(#)Makefile	1.15	(2.11BSD GTE)	1996/10/23
  #
  M=/usr/src/lib/mip
  P=/usr/src/lib/pcc
***************
*** 8,14 ****
  MKSTR=	/usr/ucb/mkstr
  
  # turn off the debugging to save string space
! STRINGS=\"/usr/lib/lint/lintstrings\"
  CFLAGS=-O -I$M -I. -DBUG1 -DBUG2 -DBUG3 -DBUG4 -DSTRINGFILE=${STRINGS}
  LFLAGS=-i
  
--- 8,14 ----
  MKSTR=	/usr/ucb/mkstr
  
  # turn off the debugging to save string space
! STRINGS=\"/usr/share/misc/lintstrings\"
  CFLAGS=-O -I$M -I. -DBUG1 -DBUG2 -DBUG3 -DBUG4 -DSTRINGFILE=${STRINGS}
  LFLAGS=-i
  
***************
*** 106,118 ****
  		common.c pftn.c trees.c optim.c hash.c lint.c
  
  install: all SHELL
! 	install -c -m 755 -s lpass1 ${DESTDIR}/usr/lib/lint/lint1
! 	install -c -m 755 -s lpass2 ${DESTDIR}/usr/lib/lint/lint2
! 	install -c -m 444 lintstrings ${DESTDIR}/usr/lib/lint/lintstrings
  	./libs
! 	-rm -f ${DESTDIR}/usr/lib/lint/llib-ltermlib*
! 	ln -s llib-ltermcap ${DESTDIR}/usr/lib/lint/llib-ltermlib
! 	ln -s llib-ltermcap.ln ${DESTDIR}/usr/lib/lint/llib-ltermlib.ln
  	install -c SHELL ${DESTDIR}/usr/bin/lint
  
  clean:
--- 106,120 ----
  		common.c pftn.c trees.c optim.c hash.c lint.c
  
  install: all SHELL
! 	-mkdir ${DESTDIR}/usr/libexec/lint
! 	chmod 755 ${DESTDIR}/usr/libexec/lint
! 	install -c -m 755 -s lpass1 ${DESTDIR}/usr/libexec/lint/lint1
! 	install -c -m 755 -s lpass2 ${DESTDIR}/usr/libexec/lint/lint2
! 	install -c -m 444 lintstrings ${DESTDIR}/usr/share/misc/lintstrings
  	./libs
! 	-rm -f ${DESTDIR}/usr/share/lint/llib-ltermlib*
! 	ln -s llib-ltermcap ${DESTDIR}/usr/share/lint/llib-ltermlib
! 	ln -s llib-ltermcap.ln ${DESTDIR}/usr/share/lint/llib-ltermlib.ln
  	install -c SHELL ${DESTDIR}/usr/bin/lint
  
  clean:
*** /usr/src/usr.bin/lint/SHELL.old	Mon Mar 11 13:10:17 1985
--- /usr/src/usr.bin/lint/SHELL	Wed Oct 23 21:07:00 1996
***************
*** 1,9 ****
  #! /bin/sh
  #
! #	@(#)SHELL	1.7	(Berkeley)	3/11/85
  #
! L=/usr/lib/lint/lint T=/tmp/lint.$$ PATH=/bin:/usr/bin O="-C -Dlint"
! X= P=unix LL=/usr/lib/lint
  C=
  trap "rm -f $T; exit" 1 2 15
  for A in $*
--- 1,9 ----
  #! /bin/sh
  #
! #	@(#)SHELL	1.7.1	(2.11BSD)	1996/10/23
  #
! L=/usr/libexec/lint/lint T=/tmp/lint.$$ PATH=/bin:/usr/bin O="-C -Dlint"
! X= P=unix LL=/usr/share/lint
  C=
  trap "rm -f $T; exit" 1 2 15
  for A in $*
*** /usr/src/usr.bin/lint/libs.old	Sat Aug  3 12:30:07 1991
--- /usr/src/usr.bin/lint/libs	Sun Oct 27 20:06:07 1996
***************
*** 1,11 ****
  #! /bin/sh -v
  
! cd /usr/lib/lint
! /lib/cpp -C -Dlint llib-port | ./lint1 -puv > llib-port.ln
! /lib/cpp -C -Dlint llib-ldbm | ./lint1 -uv > llib-ldbm.ln
! /lib/cpp -C -Dlint llib-lm | ./lint1 -uv > llib-lm.ln
! /lib/cpp -C -Dlint llib-lmp | ./lint1 -uv > llib-lmp.ln
! /lib/cpp -C -Dlint llib-lplot | ./lint1 -uv > llib-lplot.ln
! /lib/cpp -C -Dlint llib-ltermcap | ./lint1 -uv > llib-ltermcap.ln
! /lib/cpp -C -Dlint llib-lc | ./lint1 -v > llib-lc.ln
! /lib/cpp -C -Dlint llib-lcurses | ./lint1 -v > llib-lcurses.ln
--- 1,11 ----
  #! /bin/sh -v
  
! cd /usr/share/lint
! /lib/cpp -C -Dlint llib-port | /usr/libexec/lint/lint1 -puv > llib-port.ln
! /lib/cpp -C -Dlint llib-ldbm | /usr/libexec/lint/lint1 -uv > llib-ldbm.ln
! /lib/cpp -C -Dlint llib-lm | /usr/libexec/lint/lint1 -uv > llib-lm.ln
! /lib/cpp -C -Dlint llib-lmp | /usr/libexec/lint/lint1 -uv > llib-lmp.ln
! /lib/cpp -C -Dlint llib-lplot | /usr/libexec/lint/lint1 -uv > llib-lplot.ln
! /lib/cpp -C -Dlint llib-ltermcap | /usr/libexec/lint/lint1 -uv > llib-ltermcap.ln
! /lib/cpp -C -Dlint llib-lc | /usr/libexec/lint/lint1 -v > llib-lc.ln
! /lib/cpp -C -Dlint llib-lcurses | /usr/libexec/lint/lint1 -v > llib-lcurses.ln
*** /usr/src/usr.bin/ptx.c.old	Mon Feb 16 16:22:29 1987
--- /usr/src/usr.bin/ptx.c	Wed Oct 23 21:20:45 1996
***************
*** 1,5 ****
! static char *sccsid = "@(#)ptx.c	4.2 (Berkeley) 9/23/85";
! #
  
  /*	permuted title index
  	ptx [-t] [-i ignore] [-o only] [-w num] [-f] [input] [output]
--- 1,6 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)ptx.c	4.2.1 (2.11BSD) 1996/10/23";
! #endif
  
  /*	permuted title index
  	ptx [-t] [-i ignore] [-o only] [-w num] [-f] [input] [output]
***************
*** 6,12 ****
  	Ptx reads the input file and permutes on words in it.
  	It excludes all words in the ignore file.
  	Alternately it includes words in the only file.
! 	if neither is given it excludes the words in /usr/lib/eign.
  
  	The width of the output line can be changed to num
  	characters.  If omitted 72 is default unless troff than 100.
--- 7,13 ----
  	Ptx reads the input file and permutes on words in it.
  	It excludes all words in the ignore file.
  	Alternately it includes words in the only file.
! 	if neither is given it excludes the words in /usr/share/misc/eign.
  
  	The width of the output line can be changed to num
  	characters.  If omitted 72 is default unless troff than 100.
***************
*** 20,26 ****
  #include <stdio.h>
  #include <ctype.h>
  #include <signal.h>
! #define DEFLTX "/usr/lib/eign"
  #define TILDE 0177
  #define SORT "/usr/bin/sort"
  #define	N 30
--- 21,27 ----
  #include <stdio.h>
  #include <ctype.h>
  #include <signal.h>
! #define DEFLTX "/usr/share/misc/eign"
  #define TILDE 0177
  #define SORT "/usr/bin/sort"
  #define	N 30
*** /usr/src/usr.bin/refer/Makefile.old	Mon Dec 26 00:48:54 1988
--- /usr/src/usr.bin/refer/Makefile	Wed Oct 23 21:25:35 1996
***************
*** 1,4 ****
! #	@(#)Makefile	4.5	(Berkeley)	84/06/05
  #
  DESTDIR=
  CFLAGS = -O
--- 1,4 ----
! #	@(#)Makefile	4.5.1	(2.11BSD)	1996/10/23
  #
  DESTDIR=
  CFLAGS = -O
***************
*** 38,53 ****
  	cc ${SEPFLAG} sortbib.o -o sortbib
  
  install: all /usr/dict/papers
! 	install -s mkey $(DESTDIR)/usr/lib/refer
! 	install -s inv  $(DESTDIR)/usr/lib/refer
! 	install -s hunt $(DESTDIR)/usr/lib/refer
! 	install -s refer $(DESTDIR)/usr/bin
! 	install -s addbib $(DESTDIR)/usr/bin
! 	install -s sortbib $(DESTDIR)/usr/bin
! 	install -c roffbib.sh $(DESTDIR)/usr/bin/roffbib
! 	install -c indxbib.sh $(DESTDIR)/usr/bin/indxbib
! 	install -s lookbib $(DESTDIR)/usr/bin
! 	install -c tmac.bib $(DESTDIR)/usr/lib/tmac
  	(cd /usr/dict/papers; /bin/sh runinv)
  
  clean:
--- 38,55 ----
  	cc ${SEPFLAG} sortbib.o -o sortbib
  
  install: all /usr/dict/papers
! 	-mkdir -p ${DESTDIR}/usr/libexec/refer
! 	chmod 755 ${DESTDIR}/usr/libexec/refer
! 	install -s -m 755 mkey $(DESTDIR)/usr/libexec/refer
! 	install -s -m 755 inv  $(DESTDIR)/usr/libexec/refer
! 	install -s -m 755 hunt $(DESTDIR)/usr/libexec/refer
! 	install -s -m 755 refer $(DESTDIR)/usr/bin
! 	install -s -m 755 addbib $(DESTDIR)/usr/bin
! 	install -s -m 755 sortbib $(DESTDIR)/usr/bin
! 	install -c -m 755 roffbib.sh $(DESTDIR)/usr/bin/roffbib
! 	install -c -m 755 indxbib.sh $(DESTDIR)/usr/bin/indxbib
! 	install -s -m 755 lookbib $(DESTDIR)/usr/bin
! 	install -c -m 444 tmac.bib $(DESTDIR)/usr/share/tmac
  	(cd /usr/dict/papers; /bin/sh runinv)
  
  clean:
*** /usr/src/usr.bin/refer/glue3.c.old	Mon Feb 16 16:20:56 1987
--- /usr/src/usr.bin/refer/glue3.c	Wed Oct 23 21:26:40 1996
***************
*** 1,5 ****
! #ifndef lint
! static char *sccsid = "@(#)glue3.c	4.1 (Berkeley) 5/6/83";
  #endif
  
  #include "refer..c"
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)glue3.c	4.1.1 (2.11BSD) 1996/10/23";
  #endif
  
  #include "refer..c"
***************
*** 27,33 ****
  		move (fr1, 0);
  		move (fw2, 1);
  		if (rprog[0]!= '/')
! 			chdir("/usr/lib/refer");
  		execl(rprog, "deliv", arg, 0);
  		err ("Can't run %s", rprog);
  	}
--- 27,33 ----
  		move (fr1, 0);
  		move (fw2, 1);
  		if (rprog[0]!= '/')
! 			chdir("/usr/libexec/refer");
  		execl(rprog, "deliv", arg, 0);
  		err ("Can't run %s", rprog);
  	}
*** /usr/src/usr.bin/refer/hunt8.c.old	Mon Feb 16 16:20:57 1987
--- /usr/src/usr.bin/refer/hunt8.c	Wed Oct 23 21:27:19 1996
***************
*** 1,5 ****
! #ifndef lint
! static char *sccsid = "@(#)hunt8.c	4.2 (Berkeley) 6/23/83";
  #endif
  
  #include <stdio.h>
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)hunt8.c	4.2.1 (2.11BSD) 1996/10/23";
  #endif
  
  #include <stdio.h>
***************
*** 13,19 ****
  {
  	/* make a file suitable for fgrep */
  	char tmp[200];
! 	sprintf(tmp, "/usr/lib/refer/mkey %s >%s.ig", s,s);
  	system(tmp);
  }
  
--- 13,19 ----
  {
  	/* make a file suitable for fgrep */
  	char tmp[200];
! 	sprintf(tmp, "/usr/libexec/refer/mkey %s >%s.ig", s,s);
  	system(tmp);
  }
  
*** /usr/src/usr.bin/refer/indxbib.sh.old	Mon Dec 26 00:51:57 1988
--- /usr/src/usr.bin/refer/indxbib.sh	Wed Oct 23 21:27:49 1996
***************
*** 1,11 ****
  #! /bin/sh
  #
! #	@(#)indxbib.sh	4.1	(Berkeley)	83/05/08
  #
  #	indxbib sh script
  #
  if test $1
! 	then /usr/lib/refer/mkey $* | /usr/lib/refer/inv $1_
  	mv $1.ia_ $1.ia
  	mv $1.ib_ $1.ib
  	mv $1.ic_ $1.ic
--- 1,11 ----
  #! /bin/sh
  #
! #	@(#)indxbib.sh	4.1.1	(2.11BSD)	1996/10/23
  #
  #	indxbib sh script
  #
  if test $1
! 	then /usr/libexec/refer/mkey $* | /usr/libexec/refer/inv $1_
  	mv $1.ia_ $1.ia
  	mv $1.ib_ $1.ib
  	mv $1.ic_ $1.ic
*** /usr/src/usr.bin/refer/lookbib.c.old	Mon Jan 10 22:46:58 1994
--- /usr/src/usr.bin/refer/lookbib.c	Wed Oct 23 21:28:30 1996
***************
*** 1,5 ****
  #if	defined(DOSCCS) && !defined(lint)
! static char *sccsid = "@(#)lookbib.c	4.4.1 (2.11BSD GTE) 1/1/94";
  #endif
  
  #include <stdio.h>
--- 1,5 ----
  #if	defined(DOSCCS) && !defined(lint)
! static char *sccsid = "@(#)lookbib.c	4.4.2 (2.11BSD GTE) 1996/10/23";
  #endif
  
  #include <stdio.h>
***************
*** 9,15 ****
  int argc;
  char **argv;
  {
! 	FILE *fp, *hfp, *fopen(), *popen();
  	char s[BUFSIZ], hunt[64], *sprintf();
  	int instructions = 1;
  
--- 9,15 ----
  int argc;
  char **argv;
  {
! 	FILE *fp, *hfp;
  	char s[BUFSIZ], hunt[64], *sprintf();
  	int instructions = 1;
  
***************
*** 44,50 ****
  			exit(1);
  		}
  	}
! 	sprintf(hunt, "/usr/lib/refer/hunt %s", argv[1]);
  
  	if (instructions && isatty(fileno(fp)))
  	{
--- 44,50 ----
  			exit(1);
  		}
  	}
! 	sprintf(hunt, "/usr/libexec/refer/hunt %s", argv[1]);
  
  	if (instructions && isatty(fileno(fp)))
  	{
***************
*** 61,67 ****
  			goto again;
  		if ((hfp = popen(hunt, "w")) == NULL)
  		{
! 			perror("lookbib: /usr/lib/refer/hunt");
  			exit(1);
  		}
  		map_lower(s);
--- 61,67 ----
  			goto again;
  		if ((hfp = popen(hunt, "w")) == NULL)
  		{
! 			perror("lookbib: /usr/libexec/refer/hunt");
  			exit(1);
  		}
  		map_lower(s);
*** /usr/src/usr.bin/refer/mkey1.c.old	Mon Feb 16 16:20:58 1987
--- /usr/src/usr.bin/refer/mkey1.c	Wed Oct 23 21:29:34 1996
***************
*** 1,10 ****
! #ifndef lint
! static char *sccsid = "@(#)mkey1.c	4.1 (Berkeley) 5/6/83";
  #endif
  
  #include <stdio.h>
  
! extern char *comname;	/* "/usr/lib/eign" */
  int wholefile = 0;
  int keycount = 100;
  int labels = 1;
--- 1,10 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)mkey1.c	4.1.1 (2.11BSD) 1996/10/23";
  #endif
  
  #include <stdio.h>
  
! extern char *comname;	/* "/usr/share/misc/eign" */
  int wholefile = 0;
  int keycount = 100;
  int labels = 1;
*** /usr/src/usr.bin/refer/mkey3.c.old	Mon Feb 16 16:20:58 1987
--- /usr/src/usr.bin/refer/mkey3.c	Wed Oct 23 21:30:17 1996
***************
*** 1,5 ****
! #ifndef lint
! static char *sccsid = "@(#)mkey3.c	4.1 (Berkeley) 5/6/83";
  #endif
  
  #include <stdio.h>
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)mkey3.c	4.1.1 (2.11BSD) 1996/10/23";
  #endif
  
  #include <stdio.h>
***************
*** 6,14 ****
  #define COMNUM 500
  #define COMTSIZE 997
  
! char *comname = "/usr/lib/eign";
  static int cgate = 0;
- extern char *comname;
  int comcount = 100;
  static char cbuf[COMNUM*9];
  static char *cwds[COMTSIZE];
--- 6,13 ----
  #define COMNUM 500
  #define COMTSIZE 997
  
! char *comname = "/usr/share/misc/eign";
  static int cgate = 0;
  int comcount = 100;
  static char cbuf[COMNUM*9];
  static char *cwds[COMTSIZE];
*** /usr/src/usr.bin/refer/thash.c.old	Mon Feb 16 16:21:00 1987
--- /usr/src/usr.bin/refer/thash.c	Wed Oct 23 21:30:47 1996
***************
*** 1,5 ****
! #ifndef lint
! static char *sccsid = "@(#)thash.c	4.1 (Berkeley) 5/6/83";
  #endif
  
  #include <stdio.h>
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)thash.c	4.1.1 (2.11BSD) 1996/10/23";
  #endif
  
  #include <stdio.h>
***************
*** 7,13 ****
  
  int nh 500;
  int saw[6000];
! char *comname "/usr/lib/eign";
  
  main (argc,argv)
  char *argv[];
--- 7,13 ----
  
  int nh 500;
  int saw[6000];
! char *comname "/usr/share/misc/eign";
  
  main (argc,argv)
  char *argv[];
*** /usr/src/usr.bin/refer/tmac.bib.old	Mon Feb 16 16:21:01 1987
--- /usr/src/usr.bin/refer/tmac.bib	Wed Oct 23 21:31:15 1996
***************
*** 1,4 ****
! ...	@(#)tmac.bib	4.1	(Berkeley)	83/05/08
  .ds TL BIBLIOGRAPHY
  .	\" HD - header macro
  .de HD
--- 1,4 ----
! ...	@(#)tmac.bib	4.1.1	(2.11BSD)	1996/10/23
  .ds TL BIBLIOGRAPHY
  .	\" HD - header macro
  .de HD
***************
*** 19,25 ****
  .vs 12p
  'bp
  ..
! .so /usr/lib/ms/s.acc
  .wh 0 HD
  .wh -1i FT
  .if n .na
--- 19,25 ----
  .vs 12p
  'bp
  ..
! .so /usr/share/ms/s.acc
  .wh 0 HD
  .wh -1i FT
  .if n .na
*** /usr/src/usr.bin/refer/what3.c.old	Mon Feb 16 16:21:01 1987
--- /usr/src/usr.bin/refer/what3.c	Wed Oct 23 21:32:09 1996
***************
*** 1,5 ****
! #ifndef lint
! static char *sccsid = "@(#)what3.c	4.1 (Berkeley) 5/6/83";
  #endif
  
  #include "what..c"
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)what3.c	4.1.1 (2.11BSD) 1996/10/23";
  #endif
  
  #include "what..c"
***************
*** 28,34 ****
  		close(fpb[RD]); 
  		close(fpc[RD]); 
  		close(fpc[WR]); 
! 		execl("/usr/lib/refer/mkey", "mkey", "-s", 0);
  		_assert(0);
  	}
  	if (  (pid2 = fork()) == 0)
--- 28,34 ----
  		close(fpb[RD]); 
  		close(fpc[RD]); 
  		close(fpc[WR]); 
! 		execl("/usr/libexec/refer/mkey", "mkey", "-s", 0);
  		_assert(0);
  	}
  	if (  (pid2 = fork()) == 0)
***************
*** 41,47 ****
  		close(fpa[WR]); 
  		close(fpb[WR]); 
  		close(fpc[RD]);
! 		execl("/usr/lib/refer/hunt", "hunt",
  		/* "-P", */
  		coarg, "-Ty", "-Fn", "/usr/dict/lookall/All", 0);
  		_assert(0);
--- 41,47 ----
  		close(fpa[WR]); 
  		close(fpb[WR]); 
  		close(fpc[RD]);
! 		execl("/usr/libexec/refer/hunt", "hunt",
  		/* "-P", */
  		coarg, "-Ty", "-Fn", "/usr/dict/lookall/All", 0);
  		_assert(0);
*** /usr/src/usr.bin/roff/common_source/README.old	Thu Aug  5 14:53:30 1982
--- /usr/src/usr.bin/roff/common_source/README	Wed Oct 23 21:36:13 1996
***************
*** 2,18 ****
  is changed somewhat from the version you
  may be used to.
  
! 1. fonts are in /usr/lib/font/ftXX,
  where XX is the name of the font (e.g., HI).
  Source is in ./font/ftXX.c.
  
  2. macro files like -ms are searched for in
! /usr/lib/tmac/tmac.xxx.
! Your /usr/lib/tmac may have to be changed.
  The .so request has been modified to make it a
  fatal error to try .so non-existent-file;
  this should head off people who are explcitly 
! including /usr/lib/tmac.s, etc.
  
  3. terminal driving tables for nroff are
! in /usr/lib/term/tabxxx instead of /usr/lib/term/xxx.
--- 2,18 ----
  is changed somewhat from the version you
  may be used to.
  
! 1. fonts are in /usr/share/font/ftXX,
  where XX is the name of the font (e.g., HI).
  Source is in ./font/ftXX.c.
  
  2. macro files like -ms are searched for in
! /usr/share/tmac/tmac.xxx.
! Your /usr/share/tmac may have to be changed.
  The .so request has been modified to make it a
  fatal error to try .so non-existent-file;
  this should head off people who are explcitly 
! including /usr/share/tmac.s, etc.
  
  3. terminal driving tables for nroff are
! in /usr/share/term/tabxxx instead of /usr/share/term/xxx.
*** /usr/src/usr.bin/roff/common_source/ni.c.old	Tue Sep 15 17:00:56 1987
--- /usr/src/usr.bin/roff/common_source/ni.c	Sun Oct 27 20:50:41 1996
***************
*** 1,5 ****
! #ifndef lint
! static char sccsid[] = "@(#)ni.c	4.2 9/15/87";
  #endif lint
  
  #include "tdef.h"
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)ni.c  4.2.1  (2.11BSD) 1996/10/23";
  #endif lint
  
  #include "tdef.h"
***************
*** 23,33 ****
  int pto = 10000;
  int pfrom = 1;
  int print = 1;
! char nextf[NS] = "/usr/lib/tmac/tmac.xxxxx";
! int nfi = 19;
  #ifdef NROFF
! char termtab[NS] = "/usr/lib/term/tablpr";
! int tti = 17;
  #endif
  #ifndef NROFF
  int oldbits = -1;
--- 23,33 ----
  int pto = 10000;
  int pfrom = 1;
  int print = 1;
! char nextf[NS] = "/usr/share/tmac/tmac.xxxxx";
! int nfi = 21;
  #ifdef NROFF
! char termtab[NS] = "/usr/share/term/tablpr";
! int tti = 19;
  #endif
  #ifndef NROFF
  int oldbits = -1;
*** /usr/src/usr.bin/roff/nroff/n10.c.old	Wed Apr 17 21:43:52 1985
--- /usr/src/usr.bin/roff/nroff/n10.c	Wed Oct 23 21:38:25 1996
***************
*** 1,6 ****
! #ifndef lint
! static char sccsid[] = "@(#)n10.c	4.2 4/17/85";
! #endif lint
  
  #include "tdef.h"
  #include <sgtty.h>
--- 1,6 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)n10.c	4.2.1 (2.11BSD) 1996/10/23";
! #endif
  
  #include "tdef.h"
  #include <sgtty.h>
***************
*** 50,56 ****
  	int x[8];
  	extern char *setbrk();
  
! 	if(((i=open(termtab,0)) < 0) && (i=open("/usr/lib/term/tablpr",0)) < 0){
  		prstr("Cannot open ");
  		prstr(termtab);
  		prstr("\n");
--- 50,56 ----
  	int x[8];
  	extern char *setbrk();
  
! 	if(((i=open(termtab,0)) < 0) && (i=open("/usr/share/term/tablpr",0)) < 0){
  		prstr("Cannot open ");
  		prstr(termtab);
  		prstr("\n");
*** /usr/src/usr.bin/roff/nroff_term/Makefile.old	Mon Jan 18 09:36:52 1993
--- /usr/src/usr.bin/roff/nroff_term/Makefile	Sun Oct 27 20:57:09 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.7	(Berkeley)	6/18/87
  #
  # Possible options:
  #	make		compile source for all terminal tables below
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.7.1	(2.11BSD)	1996/10/23
  #
  # Possible options:
  #	make		compile source for all terminal tables below
***************
*** 12,18 ****
  #	make clean	remove tab*.o files lying around
  CFLAGS=	-O
  LIBC=	/lib/libc.a
! DEST=	${DESTDIR}/usr/lib/term
  SRCS=	tab300-12.c tab300.c tab302-12.c tab302.c tab37.c tab382-12.c \
  	tab382.c tab450-12.c tab450.c tab833-12.c tab833.c tabepson.c \
  	tabitoh.c tabitoh12.c tablpr.c tabnec-t.c tabnec.c tabnec12.c \
--- 12,18 ----
  #	make clean	remove tab*.o files lying around
  CFLAGS=	-O
  LIBC=	/lib/libc.a
! DEST=	${DESTDIR}/usr/share/term
  SRCS=	tab300-12.c tab300.c tab302-12.c tab302.c tab37.c tab382-12.c \
  	tab382.c tab450-12.c tab450.c tab833-12.c tab833.c tabepson.c \
  	tabitoh.c tabitoh12.c tablpr.c tabnec-t.c tabnec.c tabnec12.c \
***************
*** 62,69 ****
  	mkdep ${CFLAGS} ${SRCS}
  
  install: ${ALL}
  	for file in tab*.o; do \
! 		install -s -o bin -g bin -m 755 $$file ${DEST}/`basename $$file .o`; \
  	done
  	rm -f ${DEST}/tabtn300; ln ${DEST}/tablpr ${DEST}/tabtn300
  	rm -f ${DEST}/tabcrt; ln ${DEST}/tablpr ${DEST}/tabcrt
--- 62,71 ----
  	mkdep ${CFLAGS} ${SRCS}
  
  install: ${ALL}
+ 	-mkdir -p ${DEST}
+ 	chmod 755 ${DEST}
  	for file in tab*.o; do \
! 		install -c -s -o bin -g bin -m 755 $$file ${DEST}/`basename $$file .o`; \
  	done
  	rm -f ${DEST}/tabtn300; ln ${DEST}/tablpr ${DEST}/tabtn300
  	rm -f ${DEST}/tabcrt; ln ${DEST}/tablpr ${DEST}/tabcrt
*** /usr/src/usr.bin/roff/troff/svt6.c.old	Thu Aug  5 14:53:25 1982
--- /usr/src/usr.bin/roff/troff/svt6.c	Wed Oct 23 21:43:04 1996
***************
*** 1,6 ****
! #ifndef lint
! static char sccsid[] = "@(#)svt6.c	4.1 6/7/82";
! #endif lint
  
  #include "tdef.h"
  extern
--- 1,6 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)svt6.c	4.1.1 (2.11BSD) 1996/10/23";
! #endif
  
  #include "tdef.h"
  extern
***************
*** 52,58 ****
  extern int vflag;
  extern int ch0;
  extern int lg;
! char fontfile[] = "/usr/lib/font/ftXX";
  int ffi = 16;
  extern int bd;
  extern int level;
--- 52,58 ----
  extern int vflag;
  extern int ch0;
  extern int lg;
! char fontfile[] = "/usr/share/font/ftXX";
  int ffi = 16;
  extern int bd;
  extern int level;
*** /usr/src/usr.bin/roff/troff/t6.c.old	Wed Feb 23 20:29:00 1983
--- /usr/src/usr.bin/roff/troff/t6.c	Wed Oct 23 21:42:28 1996
***************
*** 1,6 ****
! #ifndef lint
! static char sccsid[] = "@(#)t6.c	4.2 2/23/83";
! #endif lint
  
  #include "tdef.h"
  extern
--- 1,6 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)t6.c	4.2.1 (2.11BSD) 1996/10/23";
! #endif
  
  #include "tdef.h"
  extern
***************
*** 52,58 ****
  extern int vflag;
  extern int ch0;
  extern int lg;
! char *fontfile = "/usr/lib/font/ftXX";
  int ffi = 0;
  extern int bd;
  extern int level;
--- 52,58 ----
  extern int vflag;
  extern int ch0;
  extern int lg;
! char *fontfile = "/usr/share/font/ftXX";
  int ffi = 0;
  extern int bd;
  extern int level;
*** /usr/src/usr.bin/roff/troff_font/linkrc.old	Thu Aug  5 14:51:23 1982
--- /usr/src/usr.bin/roff/troff_font/linkrc	Wed Oct 23 21:43:58 1996
***************
*** 1,4 ****
! cd /usr/lib/font
  rm ftH ftHI ftHM ftFD ftCI
  ln ftG ftH
  ln ftGI ftHI
--- 1,4 ----
! cd /usr/share/font
  rm ftH ftHI ftHM ftFD ftCI
  ln ftG ftH
  ln ftGI ftHI
*** /usr/src/usr.bin/roff/troff_font/onefont.old	Thu Aug  5 14:51:23 1982
--- /usr/src/usr.bin/roff/troff_font/onefont	Wed Oct 23 21:44:13 1996
***************
*** 1,5 ****
  cc -c $1.c
  strip $1.o
! mv $1.o /usr/lib/font/$1
! chmod 755 /usr/lib/font/$1
  echo $1 done
--- 1,5 ----
  cc -c $1.c
  strip $1.o
! mv $1.o /usr/share/font/$1
! chmod 755 /usr/share/font/$1
  echo $1 done
*** /usr/src/usr.bin/spell/Makefile.old	Mon Feb 16 18:24:30 1987
--- /usr/src/usr.bin/spell/Makefile	Wed Oct 23 21:53:35 1996
***************
*** 1,4 ****
! #	@(#)Makefile	4.3	5/25/83
  
  CFLAGS= -O
  SEPFLAG= -i
--- 1,4 ----
! #	@(#)Makefile	4.3.1 (2.11BSD)	1996/10/23
  
  CFLAGS= -O
  SEPFLAG= -i
***************
*** 6,12 ****
  all:	spell hlist hlista hlistb hstop spellin spellout
  
  install:	all
! 	install -s spell $(DESTDIR)/usr/lib
  	install -s spellin ${DESTDIR}/usr/bin
  	install -s spellout ${DESTDIR}/usr/bin
  	install -c hlista $(DESTDIR)/usr/dict
--- 6,12 ----
  all:	spell hlist hlista hlistb hstop spellin spellout
  
  install:	all
! 	install -s spell $(DESTDIR)/usr/libexec
  	install -s spellin ${DESTDIR}/usr/bin
  	install -s spellout ${DESTDIR}/usr/bin
  	install -c hlista $(DESTDIR)/usr/dict
*** /usr/src/usr.bin/spell/spell.sh.old	Mon Feb 16 16:22:24 1987
--- /usr/src/usr.bin/spell/spell.sh	Wed Oct 23 21:54:02 1996
***************
*** 1,6 ****
  #! /bin/sh
  #
! #	@(#)spell.sh	1.3	(Berkeley)	83/09/10
  #
  : V data for -v, B flags, D dictionary, S stop, H history, F files, T temp
  V=/dev/null		B=			F= 
--- 1,6 ----
  #! /bin/sh
  #
! #	@(#)spell.sh	1.3.1	(2.11BSD)	1996/10/23
  #
  : V data for -v, B flags, D dictionary, S stop, H history, F files, T temp
  V=/dev/null		B=			F= 
***************
*** 27,37 ****
  done
  IFS=@
  case $H in
! /dev/null)	deroff -w $F | sort -u | /usr/lib/spell $S $T |
! 		/usr/lib/spell ${D-/usr/dict/hlista} $V $B |
  		sort -u +0f +0 - $T ;;
! *)		deroff -w $F | sort -u | /usr/lib/spell $S $T |
! 		/usr/lib/spell ${D-/usr/dict/hlista} $V $B |
  		sort -u +0f +0 - $T | tee -a $H
  		who am i >> $H 2> /dev/null ;;
  esac
--- 27,37 ----
  done
  IFS=@
  case $H in
! /dev/null)	deroff -w $F | sort -u | /usr/libexec/spell $S $T |
! 		/usr/libexec/spell ${D-/usr/dict/hlista} $V $B |
  		sort -u +0f +0 - $T ;;
! *)		deroff -w $F | sort -u | /usr/libexec/spell $S $T |
! 		/usr/libexec/spell ${D-/usr/dict/hlista} $V $B |
  		sort -u +0f +0 - $T | tee -a $H
  		who am i >> $H 2> /dev/null ;;
  esac
*** /usr/src/usr.bin/struct/Makefile.old	Mon Dec 26 13:06:42 1988
--- /usr/src/usr.bin/struct/Makefile	Wed Oct 23 21:57:25 1996
***************
*** 1,4 ****
! #	Makefile	4.3	83/08/13
  #
  DESTDIR=
  CFLAGS=-O
--- 1,4 ----
! #	Makefile	4.3.1 (2.11BSD)	1996/10/23
  #
  DESTDIR=
  CFLAGS=-O
***************
*** 28,36 ****
  all:	structure beautify
  
  install: structure beautify struct
! 	install -s structure $(DESTDIR)/usr/lib/struct/structure
! 	install -s beautify $(DESTDIR)/usr/lib/struct/beautify
! 	install -c struct $(DESTDIR)/usr/bin
  clean:
  	rm -f *.o y.tab.h beauty.c structure beautify
  
--- 28,38 ----
  all:	structure beautify
  
  install: structure beautify struct
! 	-mkdir ${DESTDIR}/usr/libexec/struct
! 	chmod 755 ${DESTDIR}/usr/libexec/struct
! 	install -s -m 755 structure $(DESTDIR)/usr/libexec/struct/structure
! 	install -s -m 755 beautify $(DESTDIR)/usr/libexec/struct/beautify
! 	install -c -m 755 struct $(DESTDIR)/usr/bin
  clean:
  	rm -f *.o y.tab.h beauty.c structure beautify
  
*** /usr/src/usr.bin/struct/struct.old	Mon Feb 16 16:21:19 1987
--- /usr/src/usr.bin/struct/struct	Wed Oct 23 21:57:52 1996
***************
*** 1,6 ****
  #! /bin/sh
  #
! #	@(#)struct	4.2	(Berkeley)	83/12/19
  #
  trap "rm -f /tmp/struct*$$" 0 1 2 3 13 15
  files=no
--- 1,6 ----
  #! /bin/sh
  #
! #	@(#)struct	4.2.1	(2.11BSD)	1996/10/23
  #
  trap "rm -f /tmp/struct*$$" 0 1 2 3 13 15
  files=no
***************
*** 14,23 ****
  
  case $files in
  yes)
! 	/usr/lib/struct/structure $* >/tmp/struct$$
  	;;
  no)
  	cat >/tmp/structin$$
! 	/usr/lib/struct/structure /tmp/structin$$ $* >/tmp/struct$$
  esac &&
! 	/usr/lib/struct/beautify</tmp/struct$$
--- 14,23 ----
  
  case $files in
  yes)
! 	/usr/libexec/struct/structure $* >/tmp/struct$$
  	;;
  no)
  	cat >/tmp/structin$$
! 	/usr/libexec/struct/structure /tmp/structin$$ $* >/tmp/struct$$
  esac &&
! 	/usr/libexec/struct/beautify</tmp/struct$$
*** /usr/src/usr.bin/tbl/t1.c.old	Mon Feb 16 16:20:52 1987
--- /usr/src/usr.bin/tbl/t1.c	Wed Oct 23 22:02:15 1996
***************
*** 1,5 ****
! #ifndef lint
! static char sccsid[] = "@(#)t1.c	4.2 8/11/83";
  #endif
  
   /* t1.c: main control and input switching */
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)t1.c	4.2.1 (2.11BSD) 1996/10/23";
  #endif
  
   /* t1.c: main control and input switching */
***************
*** 13,20 ****
  # endif
  
  # ifdef unix
! # define MACROS "/usr/lib/tmac.s"
! # define PYMACS "/usr/lib/tmac.m"
  # endif
  
  # ifdef gcos
--- 13,20 ----
  # endif
  
  # ifdef unix
! # define MACROS "/usr/share/tmac/tmac.s"
! # define PYMACS "/usr/share/tmac/tmac.m"
  # endif
  
  # ifdef gcos
*** /usr/src/usr.bin/units.c.old	Mon Feb 16 16:22:30 1987
--- /usr/src/usr.bin/units.c	Wed Oct 23 22:20:35 1996
***************
*** 1,9 ****
! static char *sccsid = "@(#)units.c	4.1 (Berkeley) 10/1/80";
  #include <stdio.h>
  
  #define	NDIM	10
  #define	NTAB	601
! char	*dfile	= "/usr/lib/units";
  char	*unames[NDIM];
  double	getflt();
  int	fperr();
--- 1,12 ----
! #if	!defined(lint)
! static char *sccsid = "@(#)units.c	4.1.1 (2.11BSD) 1996/10/23";
! #endif
! 
  #include <stdio.h>
  
  #define	NDIM	10
  #define	NTAB	601
! char	*dfile	= "/usr/share/misc/units";
  char	*unames[NDIM];
  double	getflt();
  int	fperr();
*** /usr/src/usr.bin/uucp/Makefile.old	Thu Dec 22 23:43:26 1994
--- /usr/src/usr.bin/uucp/Makefile	Fri Nov  1 19:22:25 1996
***************
*** 1,4 ****
! #	Makefile	5.11.1 (2.11BSD GTE)	94/12/22
  #
  # LIBS can be set to reference other object modules and libraries needed
  # by uucico, such as -lunet (needed when UNET is defined).
--- 1,4 ----
! #	Makefile	5.11.2 (2.11BSD GTE)	1996/10/24
  #
  # LIBS can be set to reference other object modules and libraries needed
  # by uucico, such as -lunet (needed when UNET is defined).
***************
*** 38,46 ****
  SEPFLAG= -i
  LINTFLAGS= -chba
  LIBS= 
! LIBDIR=	${DESTDIR}/usr/lib/uucp
  BIN=	${DESTDIR}/usr/bin
- ETC=	${DESTDIR}/etc
  PUBDIR=	${DESTDIR}/usr/spool/uucppublic
  SPOOL=	${DESTDIR}/usr/spool/uucp
  XQTDIR=	${SPOOL}/XTMP
--- 38,46 ----
  SEPFLAG= -i
  LINTFLAGS= -chba
  LIBS= 
! SBINDIR=	${DESTDIR}/usr/sbin
! LIBEXECDIR=	${DESTDIR}/usr/libexec
  BIN=	${DESTDIR}/usr/bin
  PUBDIR=	${DESTDIR}/usr/spool/uucppublic
  SPOOL=	${DESTDIR}/usr/spool/uucp
  XQTDIR=	${SPOOL}/XTMP
***************
*** 124,134 ****
  acucntrl: acucntrl.o
  	${CC} -o acucntrl ${SEPFLAG} ${LDFLAGS} acucntrl.o ${LIBS}
  
- # Note: mode 700 on ${LIBDIR} would be safer.
- # Also,  L.sys etc should be 600.
- 
  mkdirs:
! 	-for i in ${LIBDIR} ${SPOOL} ${PUBDIR} ${XQTDIR} ${CORRUPT} \
  		${AUDIT} ${LCK} ${LOG} ${STST} ; do \
  		rm -f $$i ; mkdir $$i ; \
  		chmod 755 $$i; /etc/chown ${OWNER} $$i; chgrp ${GROUP} $$i ; \
--- 124,131 ----
  acucntrl: acucntrl.o
  	${CC} -o acucntrl ${SEPFLAG} ${LDFLAGS} acucntrl.o ${LIBS}
  
  mkdirs:
! 	-for i in ${SPOOL} ${PUBDIR} ${XQTDIR} ${CORRUPT} \
  		${AUDIT} ${LCK} ${LOG} ${STST} ; do \
  		rm -f $$i ; mkdir $$i ; \
  		chmod 755 $$i; /etc/chown ${OWNER} $$i; chgrp ${GROUP} $$i ; \
***************
*** 151,162 ****
  aculib/aculib.a:
  	cd aculib; make ${MFLAGS} "CFLAGS=${CFLAGS}"
  
! install: ${ALL}
! 	/etc/chown ${OWNER} ${LIBDIR}
! 	chgrp ${GROUP} ${LIBDIR}
! 	chmod 755 ${LIBDIR}
  	for i in uucico uuclean; do \
! 		install -s -m 6111 -o ${OWNER} -g ${GROUP} $$i ${LIBDIR} ;\
  	done
  	for i in uucp uux uulog uuname uusnap uupoll uuq uusend; do \
  		install -s -m 6111 -o ${OWNER} -g ${GROUP} $$i ${BIN} ;\
--- 148,156 ----
  aculib/aculib.a:
  	cd aculib; make ${MFLAGS} "CFLAGS=${CFLAGS}"
  
! install: mkdirs ${ALL}
  	for i in uucico uuclean; do \
! 		install -s -m 6111 -o ${OWNER} -g ${GROUP} $$i ${SBINDIR} ;\
  	done
  	for i in uucp uux uulog uuname uusnap uupoll uuq uusend; do \
  		install -s -m 6111 -o ${OWNER} -g ${GROUP} $$i ${BIN} ;\
***************
*** 163,173 ****
  	done
  	rm -f ${BIN}/ruusend
  	ln ${BIN}/uusend ${BIN}/ruusend
! 	install -s -m 6110 -o ${OWNER} -g ${GROUP} uuxqt ${LIBDIR}
! 	install -s -m 6110 -o root -g ${GROUP} acucntrl ${LIBDIR}
! 	install -s -m 500 -o uucp uucpd ${ETC}
! 	@echo Dont forget to fork off /etc/uucpd in /etc/rc.local
! 	@echo if you are not running /etc/inetd
  	install -s uuencode ${BIN}
  	install -s uudecode ${BIN}
  
--- 157,167 ----
  	done
  	rm -f ${BIN}/ruusend
  	ln ${BIN}/uusend ${BIN}/ruusend
! 	install -s -m 6110 -o ${OWNER} -g ${GROUP} uuxqt ${LIBEXECDIR}
! 	install -s -m 6110 -o root -g ${GROUP} acucntrl ${LIBEXECDIR}
! 	install -s -m 500 -o uucp uucpd ${LIBEXECDIR}
! 	@echo Dont forget to fork off /usr/libexec/uucpd in /etc/rc.local
! 	@echo if you are not running 'inetd'
  	install -s uuencode ${BIN}
  	install -s uudecode ${BIN}
  
*** /usr/src/usr.bin/uucp/README.TCP.old	Mon Feb 16 16:21:50 1987
--- /usr/src/usr.bin/uucp/README.TCP	Fri Nov  1 19:28:49 1996
***************
*** 18,25 ****
  uucp		540/tcp		uucpd
  
  Add lines to /etc/rc.local that looks something like:
! if [ -f /etc/uucpd ]; then
! 	/etc/uucpd & echo -n ' uucpd'				>/dev/console
  fi
  
  The L.sys entry should look something like:
--- 18,25 ----
  uucp		540/tcp		uucpd
  
  Add lines to /etc/rc.local that looks something like:
! if [ -f /usr/libexec/uucpd ]; then
! 	/usr/libexec/uucpd & echo -n ' uucpd'		>/dev/console
  fi
  
  The L.sys entry should look something like:
*** /usr/src/usr.bin/uucp/README.dialino.old	Mon Feb 16 16:21:49 1987
--- /usr/src/usr.bin/uucp/README.dialino	Fri Oct 25 21:20:03 1996
***************
*** 14,20 ****
  2400 baud capability.
  
  The key to this is a program is provided in the file acucntrl.c .  This should
! be installed suid to root in the file /usr/lib/uucp/acucntrl .
  
  
  uucp notes:
--- 14,20 ----
  2400 baud capability.
  
  The key to this is a program is provided in the file acucntrl.c .  This should
! be installed suid to root in the file /usr/libexec/acucntrl .
  
  
  uucp notes:
*** /usr/src/usr.bin/uucp/README.old	Mon Feb 16 16:21:37 1987
--- /usr/src/usr.bin/uucp/README	Thu Oct 24 11:00:40 1996
***************
*** 1,5 ****
  INSTALLATION GUIDE
! README	5.6	85/06/24
  
  This version is based on the "rti uucp" that was on the 4.2BSD tape.
  It contains many additional  features and fixes from Usenet,
--- 1,5 ----
  INSTALLATION GUIDE
! README	5.6.1 (2.11BSD)	1996/10/23
  
  This version is based on the "rti uucp" that was on the 4.2BSD tape.
  It contains many additional  features and fixes from Usenet,
***************
*** 34,40 ****
  longer than 7 characters that only send you the first 7 characters are
  broken and should be fixed. However, there is a way of compensating for
  this until they fix their problem. For each site you talk to that has a
! name longer that 7 characters, put a line in /usr/lib/uucp/L.aliases of
  the form:
  	fullname name-truncated-to-7-characters.
  E.g:
--- 34,40 ----
  longer than 7 characters that only send you the first 7 characters are
  broken and should be fixed. However, there is a way of compensating for
  this until they fix their problem. For each site you talk to that has a
! name longer that 7 characters, put a line in /etc/uucp/L.aliases of
  the form:
  	fullname name-truncated-to-7-characters.
  E.g:
***************
*** 65,71 ****
  Subdirectories		/usr/spool/uucp is now split into 7 subdirectories.
  			This is a huge help on busy systems.
  
! /usr/lib/uucp/L.cmds	List of commands permitted for remote execution.
  			A line of form 'PATH=...' sets the search path.
  
  expect-send sequence	Escape characters now permitted: \r, \n.
--- 65,71 ----
  Subdirectories		/usr/spool/uucp is now split into 7 subdirectories.
  			This is a huge help on busy systems.
  
! /etc/uucp/L.cmds	List of commands permitted for remote execution.
  			A line of form 'PATH=...' sets the search path.
  
  expect-send sequence	Escape characters now permitted: \r, \n.
***************
*** 100,110 ****
  	do
  		cp $i $i.old
  	done					(csh: end )
! 	cd /usr/lib/uucp
! 	for i in uucico uuxqt uuclean
! 	do
! 		cp $i $i.old
! 	done
  
  2. Editing Makefile and uucp.h
  	4.2 sites using the supported dialers are all set with defaults.
--- 100,108 ----
  	do
  		cp $i $i.old
  	done					(csh: end )
! 	cp -p /usr/sbin/uucico /usr/sbin/uucico.old
! 	cp -p /usr/libexec/uuxqt /usr/libexec/uuxqt.old
! 	cp -p /usr/sbin/uuclean /usr/sbin/uuclean.old
  
  2. Editing Makefile and uucp.h
  	4.2 sites using the supported dialers are all set with defaults.
***************
*** 133,139 ****
  	(If you are chicken, type 'make -n install' first).
  
  6. Edit and install the control files:
! 	Look in UUAIDS.  Edit and install into /usr/lib/uucp if necessary
  	USERFILE, L.cmds, L.sys, L-devices, L-dialcodes.
  	THESE FILES MUST BE OWNED BY THE SAME OWNER AND GROUP AS
  	THE UUCP COMMANDS AND UUCP SPOOL FILES!!! (probably uucp, daemon).
--- 131,137 ----
  	(If you are chicken, type 'make -n install' first).
  
  6. Edit and install the control files:
! 	Look in UUAIDS.  Edit and install into /etc/uucp if necessary
  	USERFILE, L.cmds, L.sys, L-devices, L-dialcodes.
  	THESE FILES MUST BE OWNED BY THE SAME OWNER AND GROUP AS
  	THE UUCP COMMANDS AND UUCP SPOOL FILES!!! (probably uucp, daemon).
***************
*** 146,152 ****
  	make mkdirs
  		If your system is duke, then the subdirectories created are
  		named C., D., D.duke, D.dukeX, TM., XTMP and X..
! 	rmdir /usr/lib/uucp/.XQTDIR
  		which is obsolete (XTMP replaces it).
  
  8. Move old Qed files:
--- 144,150 ----
  	make mkdirs
  		If your system is duke, then the subdirectories created are
  		named C., D., D.duke, D.dukeX, TM., XTMP and X..
! 	rmdir /etc/uucp/.XQTDIR
  		which is obsolete (XTMP replaces it).
  
  8. Move old Qed files:
***************
*** 183,189 ****
  	Test by mailing a letter somewhere and back.
  	If it works, the new system is probably fine.
  	Otherwise, figure out what is wrong.
! 	Start by examining LOGFILE.  Try /usr/lib/uucp/uucico -r1 -sname -x7
  	If things are no-go, you can back out the changes by restoring the
  	old uu programs and the spooled files.
  	NOTE: The subdirectories foul up a non-subdir version,
--- 181,187 ----
  	Test by mailing a letter somewhere and back.
  	If it works, the new system is probably fine.
  	Otherwise, figure out what is wrong.
! 	Start by examining LOGFILE.  Try /usr/sbin/uucico -r1 -sname -x7
  	If things are no-go, you can back out the changes by restoring the
  	old uu programs and the spooled files.
  	NOTE: The subdirectories foul up a non-subdir version,
*** /usr/src/usr.bin/uucp/UUAIDS/setup.tblms.old	Mon Feb 16 16:21:29 1987
--- /usr/src/usr.bin/uucp/UUAIDS/setup.tblms	Thu Oct 24 11:07:07 1996
***************
*** 77,84 ****
  which highlights the fact that the messages are machine generated.
  Here are typical lines:
  .DS L
! UUCP:iPkI/ZUX3YX2Y:4:19::/usr/spool/uucppublic:/usr/lib/uucp/uucico
! uucp:iPkI/ZUX3YX2Y:4:19::/usr/spool/uucppublic:/usr/lib/uucp/uucico
  .DE
  .NH 1
  Installing uucp programs
--- 77,84 ----
  which highlights the fact that the messages are machine generated.
  Here are typical lines:
  .DS L
! UUCP:iPkI/ZUX3YX2Y:4:19::/usr/spool/uucppublic:/usr/sbin/uucico
! uucp:iPkI/ZUX3YX2Y:4:19::/usr/spool/uucppublic:/usr/sbin/uucico
  .DE
  .NH 1
  Installing uucp programs
***************
*** 87,93 ****
  and follow the instructions.
  It references other documentation, which should also be read.
  .NH 1
! Files in /usr/lib/uucp
  .PP
  All of these files should have the uid and gid of uucp,
  and should not be readable (or writable) by others.
--- 87,93 ----
  and follow the instructions.
  It references other documentation, which should also be read.
  .NH 1
! Files in /etc/uucp
  .PP
  All of these files should have the uid and gid of uucp,
  and should not be readable (or writable) by others.
***************
*** 105,111 ****
  and can access the public directory.
  Here is a typical "Uduke" line in /etc/passwd:
  .DS L
! Uduke:PSB8EZ5w2tQ4I:4:19::/usr/spool/uucppublic:/usr/lib/uucp/uucico
  .DE
  This line differs from that for uucp
  only in having a different login name and password.
--- 105,111 ----
  and can access the public directory.
  Here is a typical "Uduke" line in /etc/passwd:
  .DS L
! Uduke:PSB8EZ5w2tQ4I:4:19::/usr/spool/uucppublic:/usr/sbin/uucico
  .DE
  This line differs from that for uucp
  only in having a different login name and password.
***************
*** 182,193 ****
  These are in uuaids/uu.*.
  Systems which call Duke should run the following script occasionally:
  .DS
! /usr/lib/uucp/uucico -r1 -sduke
  .DE
  Systems which call-out can
  request uucp to transmit waiting files:
  .DS
! /usr/lib/uucp/uucico -r1
  .DE
  The standard version of cron runs with uid "daemon"
  which may not be able to run the cleanup or uucico scripts.
--- 182,193 ----
  These are in uuaids/uu.*.
  Systems which call Duke should run the following script occasionally:
  .DS
! /usr/sbin/uucico -r1 -sduke
  .DE
  Systems which call-out can
  request uucp to transmit waiting files:
  .DS
! /usr/sbin/uucico -r1
  .DE
  The standard version of cron runs with uid "daemon"
  which may not be able to run the cleanup or uucico scripts.
*** /usr/src/usr.bin/uucp/UUAIDS/uu.daily.old	Mon Feb 16 16:21:28 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uu.daily	Thu Oct 24 11:08:41 1996
***************
*** 3,14 ****
  : If you do not have them, delete the '-d....' options below.
  : someone should use shell variables to do this
  : Much better to have subdirectories, however.
! PATH=:/bin:/usr/bin:/usr/ucb
! cd /usr/lib/uucp
  #
  umask 2
  deadtime=`expr 24 \* 7`
- cd /usr/lib/uucp
  (
  uuclean -pLTMP. -n24
  uuclean -p/usr/spool/uucp/STST -n24
--- 3,12 ----
  : If you do not have them, delete the '-d....' options below.
  : someone should use shell variables to do this
  : Much better to have subdirectories, however.
! PATH=/bin:/usr/bin:/usr/sbin:/usr/ucb
  #
  umask 2
  deadtime=`expr 24 \* 7`
  (
  uuclean -pLTMP. -n24
  uuclean -p/usr/spool/uucp/STST -n24
***************
*** 22,28 ****
  uuclean -d/usr/spool/uucp/D.`uuname -l`X -pD. -n$deadtime
  ) >/dev/null 2>&1
  
! /usr/lib/uucp/uucpsummary | /usr/ucb/Mail -s "UUCP Summary" uucplist
  cd /usr/spool/uucp
  #
  # Ma Bell's uudemon.day saves a week's worth of log file information;
--- 20,26 ----
  uuclean -d/usr/spool/uucp/D.`uuname -l`X -pD. -n$deadtime
  ) >/dev/null 2>&1
  
! /etc/uucp/uucpsummary | /usr/ucb/Mail -s "UUCP Summary" uucplist
  cd /usr/spool/uucp
  #
  # Ma Bell's uudemon.day saves a week's worth of log file information;
*** /usr/src/usr.bin/uucp/UUAIDS/uu.daily.seism.old	Mon Feb 16 16:21:30 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uu.daily.seism	Thu Oct 24 11:06:16 1996
***************
*** 1,10 ****
! PATH=:/bin:/usr/bin:/usr/ucb
! cd /usr/lib/uucp
  #
  umask 2
  # give them 7 days to get through
  deadtime=`expr 24 \* 7`
- cd /usr/lib/uucp
  (
  uuclean -d/usr/spool/uucp/LCK -n24
  uuclean -d/usr/spool/uucp/STST -n24
--- 1,8 ----
! PATH=/bin:/usr/sbin:/usr/bin:/usr/ucb
  #
  umask 2
  # give them 7 days to get through
  deadtime=`expr 24 \* 7`
  (
  uuclean -d/usr/spool/uucp/LCK -n24
  uuclean -d/usr/spool/uucp/STST -n24
***************
*** 20,26 ****
  ) >/dev/null 2>&1
  
  cd /usr/spool/uucp
! /usr/lib/uucp/uucpsummary | /usr/ucb/Mail -s "UUCP Summary" uucplist
  
  cd /usr/spool/uucp/LOG
  for i in uucico uux uuxqt uucp xferstats
--- 18,24 ----
  ) >/dev/null 2>&1
  
  cd /usr/spool/uucp
! /etc/uucp/uucpsummary | /usr/ucb/Mail -s "UUCP Summary" uucplist
  
  cd /usr/spool/uucp/LOG
  for i in uucico uux uuxqt uucp xferstats
*** /usr/src/usr.bin/uucp/UUAIDS/uu.hourly.old	Mon Feb 16 16:21:28 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uu.hourly	Thu Oct 24 11:11:03 1996
***************
*** 1,11 ****
  : Hourly uucp script
  
- cd /usr/lib/uucp
  : uulog; : uulog no longer needed
  
  : hourly poll of certain sites
! : uucico -r1 -smcnc
! : uucico -r1 -sillia
  
  : attempt to ship remaining files
! uucico -r1
--- 1,10 ----
  : Hourly uucp script
  
  : uulog; : uulog no longer needed
  
  : hourly poll of certain sites
! : /usr/sbin/uucico -r1 -smcnc
! : /usr/sbin/uucico -r1 -sillia
  
  : attempt to ship remaining files
! /usr/sbin/uucico -r1
*** /usr/src/usr.bin/uucp/UUAIDS/uucp.daily.old	Mon Feb 16 16:21:29 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uucp.daily	Fri Oct 25 21:16:30 1996
***************
*** 2,8 ****
  : '/*********************************************************************
  	uucp.daily
     
! 	Sccsid=@(#)uucp.daily	1.1
  
  	usage:
  		Called from cron in the wee early hours of the morning
--- 2,8 ----
  : '/*********************************************************************
  	uucp.daily
     
! 	Sccsid=@(#)uucp.daily	1.1.1 (2.11BSD) 1996/10/25
  
  	usage:
  		Called from cron in the wee early hours of the morning
***************
*** 18,32 ****
  : 'daily UUCP cleanup'
  : 'called in the morning'
  
- uulib=/usr/lib/uucp
  spool=/usr/spool/uucp
  olddir="$spool/OLD"
- b=/usr/local/lib
  PATH="/usr/new:/usr/ucb:/usr/local:/bin:/usr/bin" ; export PATH
  
! uulog
! $uulib/uuclean -m -p LCK. -p X. -p D. -p C. -p TM.
! $uulib/uuclean -p STST. -n 12
  
  set `date`
  day=$1
--- 18,30 ----
  : 'daily UUCP cleanup'
  : 'called in the morning'
  
  spool=/usr/spool/uucp
  olddir="$spool/OLD"
  PATH="/usr/new:/usr/ucb:/usr/local:/bin:/usr/bin" ; export PATH
  
! /usr/bin/uulog
! /usr/sbin/uuclean -m -p LCK. -p X. -p D. -p C. -p TM.
! /usr/sbin/uuclean -p STST. -n 12
  
  set `date`
  day=$1
*** /usr/src/usr.bin/uucp/UUAIDS/uucpsrv.c.old	Mon Feb 16 16:21:29 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uucpsrv.c	Thu Oct 24 11:11:59 1996
***************
*** 35,41 ****
  	}
  	close(0); close(1);
  	dup(fd); dup(fd);
! 	execl("/usr/lib/uucp/uucico", "uucico", (char *)0);
  	perror("uucico server: execl");
  	exit(1);
  }
--- 35,41 ----
  	}
  	close(0); close(1);
  	dup(fd); dup(fd);
! 	execl("/usr/sbin/uucico", "uucico", (char *)0);
  	perror("uucico server: execl");
  	exit(1);
  }
*** /usr/src/usr.bin/uucp/UUAIDS/uucpsummary.mo.old	Mon Feb 16 16:21:30 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uucpsummary.mo	Thu Oct 24 11:12:57 1996
***************
*** 5,11 ****
  	printf("\t       Calls     Minutes      Files          Bytes      Effective Unused\n")
  	printf("Site          To/From    To/From     To/From      Sent/Received  Baudrate Bwidth\n")
  E_O_F
! awk '$1 !~ /#/ && $1 !~ /xxx/{print $1,$3}' /usr/lib/uucp/L.sys | sort -u |
  sed 's/\(.*\) \(.*\)/	type["\1"] = "\2"/' >>/tmp/$$a
  cat <<'E_O_F' >>/tmp/$$a
  }
--- 5,11 ----
  	printf("\t       Calls     Minutes      Files          Bytes      Effective Unused\n")
  	printf("Site          To/From    To/From     To/From      Sent/Received  Baudrate Bwidth\n")
  E_O_F
! awk '$1 !~ /#/ && $1 !~ /xxx/{print $1,$3}' /etc/uucp/L.sys | sort -u |
  sed 's/\(.*\) \(.*\)/	type["\1"] = "\2"/' >>/tmp/$$a
  cat <<'E_O_F' >>/tmp/$$a
  }
*** /usr/src/usr.bin/uucp/UUAIDS/uuusage.old	Mon Feb 16 16:21:29 1987
--- /usr/src/usr.bin/uucp/UUAIDS/uuusage	Fri Oct 25 21:18:38 1996
***************
*** 4,10 ****
  		Print summary of UUCP usage
  	Alan S. Watt
     
! 	Sccsid=@(#)uuusage.sh	1.1
  
  	usage:
  		uuusage [-s] [-t] [period]
--- 4,10 ----
  		Print summary of UUCP usage
  	Alan S. Watt
     
! 	Sccsid=@(#)uuusage.sh	1.1.1 (2.11BSD) 1996/10/25
  
  	usage:
  		uuusage [-s] [-t] [period]
***************
*** 40,48 ****
  : '	sbytes[sname] == bytes sent/received at request of sname'
  : '	stime[sname] == time spent at request of sname'
  
- libdir=/usr/lib/uucp
  uudir=/usr/spool/uucp
! uutbl=$libdir/uutbl
  slogprefix="$uudir/OLD/SYSLOG"
  ologprefix="$uudir/OLD/UUUSAGE"
  month=
--- 40,47 ----
  : '	sbytes[sname] == bytes sent/received at request of sname'
  : '	stime[sname] == time spent at request of sname'
  
  uudir=/usr/spool/uucp
! uutbl=/usr/sbin/uutbl
  slogprefix="$uudir/OLD/SYSLOG"
  ologprefix="$uudir/OLD/UUUSAGE"
  month=