update hardware for sendbug or it could just be removed I think since the Environment: section will show what your using. So here are two patches for each.
Index: sendbug.c =================================================================== RCS file: /cvs/src/usr.bin/sendbug/sendbug.c,v retrieving revision 1.78 diff -u -p -u -r1.78 sendbug.c --- sendbug.c 21 Aug 2017 21:41:13 -0000 1.78 +++ sendbug.c 27 Dec 2017 16:17:13 -0000 @@ -43,8 +43,10 @@ int sendmail(const char *); void template(FILE *); void usbdevs(FILE *); -const char *categories = "system user library documentation kernel " - "alpha amd64 arm hppa i386 m88k mips64 powerpc sh sparc sparc64 vax"; +const char *categories[] = { + "system user library documentation kernel", + "alpha amd64 arm64 armV7 hppa i386 landisk loongson luna88k macppc octeon sgi sparc64" + }; const char *comment[] = { "<synopsis of the problem (one line)>", "<PR category (one line)>", @@ -554,8 +556,8 @@ template(FILE *fp) fprintf(fp, "SENDBUG:\n"); fprintf(fp, "SENDBUG: Choose from the following categories:\n"); fprintf(fp, "SENDBUG:\n"); - fprintf(fp, "SENDBUG: %s\n", categories); - fprintf(fp, "SENDBUG:\n"); + fprintf(fp, "SENDBUG: %s\n", categories[0]); + fprintf(fp, "SENDBUG: %s\n", categories[1]); fprintf(fp, "SENDBUG:\n"); fprintf(fp, "To: %s\n", "b...@openbsd.org"); fprintf(fp, "Subject: \n"); Index: sendbug.c =================================================================== RCS file: /cvs/src/usr.bin/sendbug/sendbug.c,v retrieving revision 1.78 diff -u -p -u -r1.78 sendbug.c --- sendbug.c 21 Aug 2017 21:41:13 -0000 1.78 +++ sendbug.c 27 Dec 2017 16:24:13 -0000 @@ -43,8 +43,6 @@ int sendmail(const char *); void template(FILE *); void usbdevs(FILE *); -const char *categories = "system user library documentation kernel " - "alpha amd64 arm hppa i386 m88k mips64 powerpc sh sparc sparc64 vax"; const char *comment[] = { "<synopsis of the problem (one line)>", "<PR category (one line)>", @@ -549,13 +547,10 @@ void template(FILE *fp) { fprintf(fp, "SENDBUG: -*- sendbug -*-\n"); + fprintf(fp, "SENDBUG:\n"); fprintf(fp, "SENDBUG: Lines starting with `SENDBUG' will" " be removed automatically.\n"); fprintf(fp, "SENDBUG:\n"); - fprintf(fp, "SENDBUG: Choose from the following categories:\n"); - fprintf(fp, "SENDBUG:\n"); - fprintf(fp, "SENDBUG: %s\n", categories); - fprintf(fp, "SENDBUG:\n"); fprintf(fp, "SENDBUG:\n"); fprintf(fp, "To: %s\n", "b...@openbsd.org"); fprintf(fp, "Subject: \n");