--- configure.in.old	Thu Jul 27 17:25:46 2000
+++ configure.in	Tue Oct 24 15:53:41 2000
@@ -143,7 +143,7 @@
 AC_LONG_LONG
 AC_CHECK_LIB(nsl, main)
 AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl putpmsg prctl sendmsg inet_ntop)
-AC_CHECK_HEADERS(sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h sys/stream.h sys/tiuser.h sys/sysconfig.h asm/sigcontext.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h linux/in6.h sys/uio.h linux/netlink.h linux/if_packet.h)
+AC_CHECK_HEADERS(sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h sys/stream.h sys/tiuser.h sys/sysconfig.h asm/sigcontext.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h linux/in6.h sys/uio.h linux/netlink.h linux/if_packet.h nfs/mount.h)
 AC_DECL_SYS_ERRLIST
 AC_DECL_SYS_SIGLIST
 AC_DECL__SYS_SIGLIST
--- config.h.in.old	Thu Jul 27 17:46:17 2000
+++ config.h.in	Tue Oct 24 15:56:54 2000
@@ -181,6 +181,9 @@
 /* Define if you have the <linux/ptrace.h> header file.  */
 #undef HAVE_LINUX_PTRACE_H
 
+/* Define if you have the <nfs/mount.h> header file.  */
+#undef HAVE_NFS_MOUNT_H
+
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
--- system.c.old	Wed Jul 26 16:40:16 2000
+++ system.c	Tue Oct 24 15:58:36 2000
@@ -1198,8 +1198,10 @@
 #include <sys/mount.h>
 #include <sys/xti.h>
 
+#if HAVE_NFS_MOUNT
 #define NFSCLIENT	1
 #include <nfs/mount.h>
+#endif
 
 #include <sys/fs/vx_ioctl.h>
 
@@ -1239,6 +1241,7 @@
 };
 #endif
 
+#if HAVE_NFS_MOUNT
 static struct xlat nfs_flags[] = {
 	{ NFSMNT_SOFT,		"NFSMNT_SOFT"		},
 	{ NFSMNT_WSIZE,		"NFSMNT_WSIZE"		},
@@ -1259,6 +1262,7 @@
 	{ NFSMNT_LWPSMAX,	"NFSMNT_LWPSMAX"	},
 	{ 0,			NULL			},
 };
+#endif
 
 int
 sys_mount(tcp)
@@ -1313,6 +1317,7 @@
 				tprintf ("dev=");
 				printstr (tcp, tcp->u_arg[4], -1);
 			}
+#if HAVE_NFS_MOUNT
 			else
 			if (strcmp (fstyp, "nfs") == 0) {
 				struct nfs_args args;
@@ -1335,6 +1340,7 @@
 					tprintf(", ...}");
 				}
 			}
+#endif
 			else
 				tprintf("%#lx", tcp->u_arg[4]);
 			tprintf(", %ld", tcp->u_arg[5]);
--- net.c.old	Wed Jul 26 16:40:16 2000
+++ net.c	Mon Oct 23 18:42:17 2000
@@ -387,6 +387,9 @@
 };
 #endif /* SOL_TCP */
 
+#if UNIXWARE >= 7
+static int old_sockaddr;	/* Horrid hack - show old format sockaddr */
+#endif
 
 void
 printsock(tcp, addr, addrlen)
@@ -411,6 +414,9 @@
 #ifdef AF_NETLINK
 		struct sockaddr_nl nl;
 #endif
+#if UNIXWARE >= 7
+		unsigned short old_sa_family;
+#endif
 	} addrbuf;
 	char string_addr[100];
 
@@ -429,6 +435,11 @@
 		tprintf("{...}");
 		return;
 	}
+#if UNIXWARE >= 7
+	if (old_sockaddr) {
+		addrbuf.sa.sa_family = addrbuf.old_sa_family;
+	}
+#endif
 
 	tprintf("{sin_family=");
 	printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
@@ -1025,6 +1036,8 @@
 struct tcb *tcp;
 int (*func) ();
 {
+	old_sockaddr = tcp->u_arg[0] <= __NETLIB_GEMINI_SVR4;
+	
 	if (entering(tcp)) {
 		int i;
 		printxval (sock_version, tcp->u_arg[0], "__NETLIB_???");
@@ -1099,6 +1112,8 @@
 sys_xgetsockaddr(tcp)
 struct tcb *tcp;
 {
+	old_sockaddr = tcp->u_arg[0] <= __NETLIB_GEMINI_SVR4;
+
 	if (entering(tcp)) {
 		printxval (sock_version, tcp->u_arg[0], "__NETLIB_???");
 		tprintf(", ");