Add patches (via Christos) based on pkgsrc contents. (These have been

forwarded to the top maintener.)

usr.bin/top/commands.c

@@ -23,8 +23,11 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
+#include "top.h"
+#include "top.local.h"
 #include "sigdesc.h"		/* generated automatically */
 #include "boolean.h"
+#include "machine.h"
 #include "utils.h"
 
 extern int  errno;
@@ -42,8 +45,8 @@ char *err_string();
  *		either 'h' or '?'.
  */
 
-show_help()
-
+show_help(statics)
+    struct statics *statics;
 {
     printf("Top version %s, %s\n", version_string(), copyright);
     fputs("\n\n\
@@ -72,8 +75,15 @@ I       - same as 'i'\n\
 k       - kill processes; send a signal to a list of processes\n\
 n or #  - change number of processes to display\n", stdout);
 #ifdef ORDER
+	{
+	    int i;
+
 	fputs("\
-o       - specify sort order (size, res, cpu, time)\n", stdout);
+o       - specify sort order (", stdout);
+	    for (i = 0; statics->order_names[i] != NULL; i++)
+		printf("%s%s", i == 0 ? "" : ", ", statics->order_names[i]);
+	    puts(")");
+	}
 #endif
 	fputs("\
 r       - renice a process\n\

usr.bin/top/os.h

@@ -30,9 +30,5 @@ caddr_t malloc();
 
 /* some systems declare sys_errlist in stdio.h! */
 #if defined(__NetBSD__) || defined(__FreeBSD__)
-#if !defined(__m68k__)
-#  if !defined(__NetBSD132__)
 #define SYS_ERRLIST_DECLARED
-#  endif	/* __NetBSD132__ */
-#endif
 #endif

usr.bin/top/top.c

@@ -711,7 +711,7 @@ Usage: %s [-ISbinqu] [-d x] [-s x] [-o field] [-U username] [number]\n",
 			    case CMD_help2:
 				reset_display();
 				clear();
-				show_help();
+				show_help(&statics);
 				standout("Hit any key to continue: ");
 				fflush(stdout);
 				(void) read(0, &ch, 1);

usr.bin/top/utils.c

@@ -16,6 +16,8 @@
 #include "top.h"
 #include "os.h"
 
+#include <errno.h>
+
 int atoiwi(str)
 
 char *str;