diff -c /usr/src.org/lib/libc/Makefile lib/libc/Makefile
*** /usr/src.org/lib/libc/Makefile	Wed Feb 24 10:20:41 1993
--- lib/libc/Makefile	Wed Feb 23 02:04:17 1994
***************
*** 6,12 ****
  # from CFLAGS below.  To remove these strings from just the system call
  # stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
  LIB=c
! CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS
  AINC=	-I${.CURDIR}/${MACHINE}
  
  .include "${.CURDIR}/compat-43/Makefile.inc"
--- 6,12 ----
  # from CFLAGS below.  To remove these strings from just the system call
  # stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
  LIB=c
! CFLAGS+=-DYP -DLIBC_SCCS -DSYSLIBC_SCCS
  AINC=	-I${.CURDIR}/${MACHINE}
  
  .include "${.CURDIR}/compat-43/Makefile.inc"
***************
*** 20,25 ****
--- 20,27 ----
  .include "${.CURDIR}/stdlib/Makefile.inc"
  .include "${.CURDIR}/string/Makefile.inc"
  .include "${.CURDIR}/sys/Makefile.inc"
+ .include "${.CURDIR}/yp/Makefile.inc"
+ .include "${.CURDIR}/rpc/Makefile.inc"
  
  beforeinstall: tags
  	install -c -o bin -g bin -m 444 ${.CURDIR}/tags \
diff -c /usr/src.org/include/Makefile include/Makefile
*** /usr/src.org/include/Makefile	Wed Dec 15 12:03:54 1993
--- include/Makefile	Tue Feb 22 17:35:41 1994
***************
*** 20,26 ****
  MFILES=	float.h frame.h
  LFILES=	errno.h fcntl.h signal.h syslog.h termios.h
  
! DIRS=arpa protocols
  LDIRS=net netimp netinet netiso netns nfs sys ufs netccitt vm iso9660 msdosfs
  
  NOOBJ=	noobj
--- 20,26 ----
  MFILES=	float.h frame.h
  LFILES=	errno.h fcntl.h signal.h syslog.h termios.h
  
! DIRS=arpa protocols rpc rpcsvc
  LDIRS=net netimp netinet netiso netns nfs sys ufs netccitt vm iso9660 msdosfs
  
  NOOBJ=	noobj
diff -c /usr/src.org/usr.bin/Makefile usr.bin/Makefile
*** /usr/src.org/usr.bin/Makefile	Tue Feb  1 08:18:03 1994
--- usr.bin/Makefile	Thu Feb 24 03:31:47 1994
***************
*** 23,29 ****
  	ul uname unexpand unifdef uniq units unvis users uucp uudecode \
  	uuencode vacation vgrind vi vis vmstat w wall wc what \
  	whereis which who whoami whois window write xargs xinstall \
! 	xstr yacc yes
  
  .if	${MACHINE} == "hp300"
  SUBDIR+=gas gcc
--- 23,29 ----
  	ul uname unexpand unifdef uniq units unvis users uucp uudecode \
  	uuencode vacation vgrind vi vis vmstat w wall wc what \
  	whereis which who whoami whois window write xargs xinstall \
! 	xstr yacc yes ypcat ypmatch ypwhich
  
  .if	${MACHINE} == "hp300"
  SUBDIR+=gas gcc
diff -c /usr/src.org/usr.sbin/amd/amd/Makefile usr.sbin/amd/amd/Makefile
*** /usr/src.org/usr.sbin/amd/amd/Makefile	Thu Jan  2 06:28:07 1992
--- usr.sbin/amd/amd/Makefile	Thu Feb 24 00:13:17 1994
***************
*** 14,20 ****
  	amq_subr.c umount_fs.c host_ops.c nfsx_ops.c \
  	ufs_ops.c ifs_ops.c amd.c get_args.c restart.c wire.c
  OBJS+=	vers.${PROG}.o
- LDADD+= -lrpc
  CFLAGS+=-I${.CURDIR}/../rpcx
  CFLAGS+=-I${.CURDIR}/../config
  CFLAGS+=-I${.CURDIR}/../include
--- 14,19 ----
diff -c /usr/src.org/usr.sbin/amd/amq/Makefile usr.sbin/amd/amq/Makefile
*** /usr/src.org/usr.sbin/amd/amq/Makefile	Thu Feb  3 14:49:40 1994
--- usr.sbin/amd/amq/Makefile	Thu Feb 24 00:13:29 1994
***************
*** 3,9 ****
  PROG=	amq
  MAN8=	amq.0
  SRCS=	amq.c amq_clnt.c amq_xdr.c misc_rpc.c
- LDADD+=	-lrpc
  CFLAGS+=-I${.CURDIR}/../include
  CFLAGS+=-I${.CURDIR}/../rpcx
  CFLAGS+=-I${.CURDIR}/../config
--- 3,8 ----
diff -c /usr/src.org/usr.sbin/Makefile usr.sbin/Makefile
*** /usr/src.org/usr.sbin/Makefile	Wed Jan  5 13:00:13 1994
--- usr.sbin/Makefile	Thu Feb 24 03:32:16 1994
***************
*** 8,14 ****
  	diskpart edquota gettable htable inetd installsw iostat \
  	kgmon kvm_mkdb lpr mrouted mtree named portmap pwd_mkdb \
  	quotaon repquota rmt rstatd rwhod sa sendmail sliplogin \
! 	syslogd tcpdump traceroute trpt trsp update vipw xntp
  
  .if   make(clean) || make(cleandir)
  SUBDIR+=dlmpcc flcopy rxformat timed
--- 8,15 ----
  	diskpart edquota gettable htable inetd installsw iostat \
  	kgmon kvm_mkdb lpr mrouted mtree named portmap pwd_mkdb \
  	quotaon repquota rmt rstatd rwhod sa sendmail sliplogin \
! 	syslogd tcpdump traceroute trpt trsp update vipw xntp \
! 	ypbind ypset yppoll
  
  .if   make(clean) || make(cleandir)
  SUBDIR+=dlmpcc flcopy rxformat timed
diff -c /usr/src.org/usr.sbin/tcpdump/tcpdump/print-nfs.c usr.sbin/tcpdump/tcpdump/print-nfs.c
*** /usr/src.org/usr.sbin/tcpdump/tcpdump/print-nfs.c	Tue Mar  9 02:46:28 1993
--- usr.sbin/tcpdump/tcpdump/print-nfs.c	Wed Feb 23 22:28:26 1994
***************
*** 38,47 ****
  #include <sys/time.h>
  #include <errno.h>
  #include <rpc/types.h>
  #include <rpc/auth.h>
  #include <rpc/auth_unix.h>
  #include <rpc/svc.h>
- #include <rpc/xdr.h>
  #include <rpc/rpc_msg.h>
  
  #include <ctype.h>
--- 38,47 ----
  #include <sys/time.h>
  #include <errno.h>
  #include <rpc/types.h>
+ #include <rpc/xdr.h>
  #include <rpc/auth.h>
  #include <rpc/auth_unix.h>
  #include <rpc/svc.h>
  #include <rpc/rpc_msg.h>
  
  #include <ctype.h>
diff -c /usr/src.org/usr.sbin/tcpdump/tcpdump/print-sunrpc.c usr.sbin/tcpdump/tcpdump/print-sunrpc.c
*** /usr/src.org/usr.sbin/tcpdump/tcpdump/print-sunrpc.c	Tue Mar  9 02:46:29 1993
--- usr.sbin/tcpdump/tcpdump/print-sunrpc.c	Wed Feb 23 22:29:56 1994
***************
*** 38,47 ****
  #include <sys/time.h>
  #include <errno.h>
  #include <rpc/types.h>
  #include <rpc/auth.h>
  #include <rpc/auth_unix.h>
  #include <rpc/svc.h>
- #include <rpc/xdr.h>
  #include <rpc/rpc_msg.h>
  
  #include <rpc/pmap_prot.h>
--- 38,47 ----
  #include <sys/time.h>
  #include <errno.h>
  #include <rpc/types.h>
+ #include <rpc/xdr.h>
  #include <rpc/auth.h>
  #include <rpc/auth_unix.h>
  #include <rpc/svc.h>
  #include <rpc/rpc_msg.h>
  
  #include <rpc/pmap_prot.h>
diff -c /usr/src.org/usr.sbin/tcpdump/tcpdump/print-udp.c usr.sbin/tcpdump/tcpdump/print-udp.c
*** /usr/src.org/usr.sbin/tcpdump/tcpdump/print-udp.c	Tue Mar  9 02:46:30 1993
--- usr.sbin/tcpdump/tcpdump/print-udp.c	Wed Feb 23 22:30:25 1994
***************
*** 39,48 ****
  #include <errno.h>
  #include <sys/time.h>
  #include <rpc/types.h>
  #include <rpc/auth.h>
  #include <rpc/auth_unix.h>
  #include <rpc/svc.h>
- #include <rpc/xdr.h>
  #include <rpc/rpc_msg.h>
  
  #include "interface.h"
--- 39,48 ----
  #include <errno.h>
  #include <sys/time.h>
  #include <rpc/types.h>
+ #include <rpc/xdr.h>
  #include <rpc/auth.h>
  #include <rpc/auth_unix.h>
  #include <rpc/svc.h>
  #include <rpc/rpc_msg.h>
  
  #include "interface.h"