Usr.sbin successfully built and installed.

libexec/diffh/.gitignore

@@ -0,0 +1 @@
+diffh

share/mk-pic32/local.prog.mk

@@ -122,26 +122,6 @@ afterinstall:
 .endif
 
 realinstall: _PROGSUBDIR
-.if defined(PROG)
-	install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
-.endif
-.if defined(HIDEGAME)
-	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
-	    chown games.bin ${PROG})
-.endif
-.if defined(LINKS) && !empty(LINKS)
-	@set ${LINKS}; \
-	while test $$# -ge 2; do \
-		l=${DESTDIR}$$1; \
-		shift; \
-		t=${DESTDIR}$$1; \
-		shift; \
-		echo $$t -\> $$l; \
-		rm -f $$t; \
-		ln $$l $$t; \
-	done; true
-.endif
 
 install: afterinstall maninstall
 afterinstall: realinstall

usr.bin/diff/diff/Makefile

@@ -4,3 +4,4 @@ PROG=	diff
 SRCS=   diff.c diffdir.c diffreg.c
 
 .include <bsd.prog.mk>
+.include "../../Makefile.inc"

usr.bin/diff/diff3/Makefile

@@ -3,3 +3,4 @@
 PROG=	diff3
 
 .include <bsd.prog.mk>
+.include "../../Makefile.inc"

usr.bin/mail/Makefile

@@ -5,12 +5,12 @@ SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
 	getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \
 	quit.c send.c strings.c temp.c tty.c vars.c
 SFILES=	mail.help mail.tildehelp
-EFILES=	mail.rc
 LINKS=	${BINDIR}/mail ${BINDIR}/Mail
 MLINKS=	mail.1 Mail.1
 
 beforeinstall:
+	install -d ${DESTDIR}/usr/share/misc
 	cd ${.CURDIR}/misc; install -c -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
-	cd ${.CURDIR}/misc; install -c -m 644 ${EFILES} ${DESTDIR}/etc
+	cd ${.CURDIR}/misc; install -c -D -m 644 mail.rc ${DESTDIR}/etc/mail.rc
 
 .include <bsd.prog.mk>

usr.sbin/Makefile

@@ -1,12 +1,14 @@
 #	@(#)Makefile	5.20 (Berkeley) 6/12/93
 
-SUBDIR=	ac accton amd arp chown chroot dev_mkdb diskpart edquota \
+SUBDIR=	accton amd arp chown chroot dev_mkdb diskpart edquota \
 	inetd kgmon kvm_mkdb lpr mtree portmap pstat pwd_mkdb \
-	quot quotaon repquota rmt rwhod sendmail sliplogin sysctl \
-	syslogd traceroute trpt trsp update vipw
+	quotaon repquota rmt rwhod sliplogin sysctl \
+	syslogd traceroute trpt update vipw
 
 # Missing on 4.4bsd tape: cron mkproto sa
 
+# TODO: ac quot sendmail trsp
+
 .if   make(clean) || make(cleandir)
 SUBDIR+=bad144 config config.new eeprom iostat timed
 .elif ${MACHINE} == "hp300"

usr.sbin/accton/.gitignore

@@ -0,0 +1 @@
+accton

usr.sbin/amd/amd/.gitignore

@@ -0,0 +1,3 @@
+amd
+vers.amd.c
+version.amd

usr.sbin/amd/amd/Makefile

@@ -27,7 +27,7 @@ CLEANFILES+=vers.${PROG}.c vers.${PROG}.o version.amd
 vers.${PROG}.c: ${SRCS:.c=.o}
 	@d=${.CURDIR}/ sh ${.CURDIR}/../config/newvers.sh ${PROG} ${MACHINE} ${OS}
 
-.PATH: ${.CURDIR}/../rpcx ${.CURDIR}/../config
-.include "Makefile.config"
+#.PATH: ${.CURDIR}/../rpcx ${.CURDIR}/../config
+.include "../config/Makefile.config"
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>

usr.sbin/amd/amd/afs_ops.c

@@ -136,7 +136,7 @@ char *opts;
 	/*
 	 * get fhandle of remote path for automount point
 	 */
-	
+
 	fhp = root_fh(dir);
 	if (!fhp) {
 		plog(XLOG_FATAL, "Can't find root file handle for %s", dir);
@@ -424,7 +424,7 @@ static void union_mounted(mf)
 mntfs *mf;
 {
 	int i;
-	
+
 	afs_mkcacheref(mf);
 
 	/*

usr.sbin/amd/amd/amq_svc.c

@@ -0,0 +1 @@
+../rpcx/amq_svc.c

usr.sbin/amd/amd/host_ops.c

@@ -98,7 +98,7 @@ am_opts *fo;
 	if (!fo->opt_rfs)
 		fo->opt_rfs = "/";
 
-	
+
 	return (*nfs_ops.fs_match)(fo);
 }
 
@@ -155,10 +155,12 @@ mntfs *mf;
 	return mount_nfs_fh(fhp, dir, fs_name, opts, mf);
 }
 
-static int sortfun P((exports *a, exports *b));
-static int sortfun(a, b)
-exports *a,*b;
+static int sortfun P((const void *x, const void *y));
+static int sortfun(x, y)
+const void *x, *y;
 {
+        const exports *a = x, *b = y;
+
 	return strcmp((*a)->ex_dir, (*b)->ex_dir);
 }
 

usr.sbin/amd/amd/info_passwd.c

@@ -113,7 +113,7 @@ time_t *tp;
 		*user++ = '\0';
 		/*
 		 * Find start of host "path".  If no / then Invalid...
-		 */ 
+		 */
 		p = strchr(dir+1, '/');
 		if (!p)
 			goto enoent;

usr.sbin/amd/amd/info_union.c

@@ -52,13 +52,8 @@
 
 #ifdef HAS_UNION_MAPS
 
-#ifdef _POSIX_SOURCE
 #include <dirent.h>
 #define	DIRENT struct dirent
-#else
-#include <sys/dir.h>
-#define	DIRENT struct direct
-#endif
 
 #define	UNION_PREFIX	"union:"
 #define	UNION_PREFLEN	6

usr.sbin/amd/amd/map.c

@@ -122,7 +122,7 @@ int nsize;
 	return 1;
 }
 
-	
+
 /*
  * The root of the mount tree.
  */

usr.sbin/amd/amd/mapc.c

@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)mapc.c	8.1 (Berkeley) 6/6/93";
  */
 
 #include "am.h"
+
 #ifdef HAS_REGEXP
 #include RE_HDR
 #endif
@@ -164,7 +165,7 @@ qelem map_list_head = { &map_list_head, &map_list_head };
 /*
  * Configuration
  */
- 
+
 /* ROOT MAP */
 static int root_init P((char*, time_t*));
 

usr.sbin/amd/amd/misc_rpc.c

@@ -172,23 +172,23 @@ AUTH *auth;
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -245,23 +245,23 @@ xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -273,41 +273,41 @@ struct rpc_errtab {
 };
 
 static struct rpc_errtab  rpc_errlist[] = {
-	{ RPC_SUCCESS, 
-		"RPC: Success" }, 
-	{ RPC_CANTENCODEARGS, 
+	{ RPC_SUCCESS,
+		"RPC: Success" },
+	{ RPC_CANTENCODEARGS,
 		"RPC: Can't encode arguments" },
-	{ RPC_CANTDECODERES, 
+	{ RPC_CANTDECODERES,
 		"RPC: Can't decode result" },
-	{ RPC_CANTSEND, 
+	{ RPC_CANTSEND,
 		"RPC: Unable to send" },
-	{ RPC_CANTRECV, 
+	{ RPC_CANTRECV,
 		"RPC: Unable to receive" },
-	{ RPC_TIMEDOUT, 
+	{ RPC_TIMEDOUT,
 		"RPC: Timed out" },
-	{ RPC_VERSMISMATCH, 
+	{ RPC_VERSMISMATCH,
 		"RPC: Incompatible versions of RPC" },
-	{ RPC_AUTHERROR, 
+	{ RPC_AUTHERROR,
 		"RPC: Authentication error" },
-	{ RPC_PROGUNAVAIL, 
+	{ RPC_PROGUNAVAIL,
 		"RPC: Program unavailable" },
-	{ RPC_PROGVERSMISMATCH, 
+	{ RPC_PROGVERSMISMATCH,
 		"RPC: Program/version mismatch" },
-	{ RPC_PROCUNAVAIL, 
+	{ RPC_PROCUNAVAIL,
 		"RPC: Procedure unavailable" },
-	{ RPC_CANTDECODEARGS, 
+	{ RPC_CANTDECODEARGS,
 		"RPC: Server can't decode arguments" },
-	{ RPC_SYSTEMERROR, 
+	{ RPC_SYSTEMERROR,
 		"RPC: Remote system error" },
-	{ RPC_UNKNOWNHOST, 
+	{ RPC_UNKNOWNHOST,
 		"RPC: Unknown host" },
 /*	{ RPC_UNKNOWNPROTO,
 		"RPC: Unknown protocol" },*/
-	{ RPC_PMAPFAILURE, 
+	{ RPC_PMAPFAILURE,
 		"RPC: Port mapper failure" },
-	{ RPC_PROGNOTREGISTERED, 
+	{ RPC_PROGNOTREGISTERED,
 		"RPC: Program not registered"},
-	{ RPC_FAILED, 
+	{ RPC_FAILED,
 		"RPC: Failed (unspecified error)"}
 };
 
@@ -330,4 +330,3 @@ clnt_sperrno(stat)
 }
 
 #endif /* NEED_CLNT_SPERRNO */
-

usr.sbin/amd/amd/mount_xdr.c

@@ -0,0 +1 @@
+../rpcx/mount_xdr.c

usr.sbin/amd/amd/mtab_bsd.c

@@ -0,0 +1 @@
+../config/mtab_bsd.c

usr.sbin/amd/amd/nfs_ops.c

@@ -448,7 +448,7 @@ mntfs *mf;
 	if (!mf->mf_private) {
 		int error;
 		struct fhstatus fhs;
-	
+
 		char *colon = strchr(mf->mf_info, ':');
 		if (colon == 0)
 			return ENOENT;

usr.sbin/amd/amd/nfs_prot_svc.c

@@ -0,0 +1 @@
+../rpcx/nfs_prot_svc.c

usr.sbin/amd/amd/nfs_prot_xdr.c

@@ -0,0 +1 @@
+../rpcx/nfs_prot_xdr.c

usr.sbin/amd/amd/nfs_start.c

@@ -41,10 +41,11 @@
  *
  */
 
-#include "am.h"
-#include "amq.h"
 #include <sys/signal.h>
 #include <setjmp.h>
+#include "am.h"
+#include "amq.h"
+
 extern jmp_buf select_intr;
 extern int select_intr_valid;
 
@@ -282,7 +283,7 @@ static serv_state run_rpc(P_void)
 			if (readfds & (1 << fwd_sock)) {
 				readfds &= ~(1 << fwd_sock);
 #endif
-				--nsel;	
+				--nsel;
 				do {
 					fwd_reply();
 				} while (rpc_pending_now() > 0);
@@ -345,7 +346,7 @@ int ppid;
 		return 1;
 	}
 
-	if ((nfsxprt = svcudp_create(so)) == NULL || 
+	if ((nfsxprt = svcudp_create(so)) == NULL ||
 			(amqp = svcudp_create(so)) == NULL) {
 		plog(XLOG_FATAL, "cannot create rpc/udp service");
 		return 2;

usr.sbin/amd/amd/nfs_subr.c

@@ -88,7 +88,7 @@ struct attrstat **attrpp;
 }
 
 /*ARGSUSED*/
-voidp 
+voidp
 nfsproc_null_2(argp, rqstp)
 voidp argp;
 struct svc_req *rqstp;
@@ -166,7 +166,7 @@ struct svc_req *rqstp;
 
 
 /*ARGSUSED*/
-voidp 
+voidp
 nfsproc_root_2(argp, rqstp)
 voidp argp;
 struct svc_req *rqstp;
@@ -283,7 +283,7 @@ struct svc_req *rqstp;
 
 
 /*ARGSUSED*/
-voidp 
+voidp
 nfsproc_writecache_2(argp, rqstp)
 voidp argp;
 struct svc_req *rqstp;