From 23243dd591d84c9357184cd5adc12542ecb3a2e0 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sun, 11 Oct 2015 21:23:15 +0000
Subject: [PATCH] -version options on commands like this make no sense; the
 version number makes no promises about compatibility nor the lack of
 compatibility. suggestion & diff from micheal reed

---
 usr.bin/sendbug/sendbug.1 |  8 +++-----
 usr.bin/sendbug/sendbug.c | 10 +++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/usr.bin/sendbug/sendbug.1 b/usr.bin/sendbug/sendbug.1
index 8f4a3ef4b71..18ed9728e13 100644
--- a/usr.bin/sendbug/sendbug.1
+++ b/usr.bin/sendbug/sendbug.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: sendbug.1,v 1.25 2015/09/09 21:23:31 schwarze Exp $
+.\" $OpenBSD: sendbug.1,v 1.26 2015/10/11 21:23:15 deraadt Exp $
 .\"
 .\" Written by Raymond Lai <ray@cyth.net>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: September 9 2015 $
+.Dd $Mdocdate: October 11 2015 $
 .Dt SENDBUG 1
 .Os
 .Sh NAME
@@ -11,7 +11,7 @@
 .Nd report a bug in OpenBSD
 .Sh SYNOPSIS
 .Nm
-.Op Fl DEPV
+.Op Fl DEP
 .Sh DESCRIPTION
 .Nm
 is used to submit problem reports (PRs) to the
@@ -80,8 +80,6 @@ to read a PR from the standard input, decode the files,
 and write them into the current directory.
 .It Fl P
 Generate and print the template with system information filled out.
-.It Fl V
-Print the version number.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
diff --git a/usr.bin/sendbug/sendbug.c b/usr.bin/sendbug/sendbug.c
index af83406d82d..c5c8a00b50f 100644
--- a/usr.bin/sendbug/sendbug.c
+++ b/usr.bin/sendbug/sendbug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sendbug.c,v 1.71 2015/10/10 20:35:01 deraadt Exp $	*/
+/*	$OpenBSD: sendbug.c,v 1.72 2015/10/11 21:23:15 deraadt Exp $	*/
 
 /*
  * Written by Ray Lai <ray@cyth.net>.
@@ -45,7 +45,6 @@ void	usbdevs(FILE *);
 
 const char *categories = "system user library documentation kernel "
     "alpha amd64 arm hppa i386 m88k mips64 powerpc sh sparc sparc64 vax";
-char *version = "5.5";
 const char *comment[] = {
 	"<synopsis of the problem (one line)>",
 	"<PR category (one line)>",
@@ -65,7 +64,7 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-DEPV]\n", __progname);
+	fprintf(stderr, "usage: %s [-DEP]\n", __progname);
 	exit(1);
 }
 
@@ -89,7 +88,7 @@ main(int argc, char *argv[])
 	if (pledge("stdio rpath wpath cpath tmppath getpw proc exec", NULL) == -1)
 		err(1, "pledge");
 
-	while ((ch = getopt(argc, argv, "DEPV")) != -1)
+	while ((ch = getopt(argc, argv, "DEP")) != -1)
 		switch (ch) {
 		case 'D':
 			Dflag = 1;
@@ -100,9 +99,6 @@ main(int argc, char *argv[])
 		case 'P':
 			Pflag = 1;
 			break;
-		case 'V':
-			printf("%s\n", version);
-			exit(0);
 		default:
 			usage();
 		}
-- 
2.20.1