trim usage to match the man page;

remove -DSEEALSO, as suggested by millert

ok millert

diff --git a/distrib/special/disklabel/Makefile b/distrib/special/disklabel/Makefile
index ee4fd09..9841d68 100644 (file)
--- a/distrib/special/disklabel/Makefile
+++ b/distrib/special/disklabel/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.11 2020/07/21 13:56:09 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.12 2021/06/24 21:11:40 jmc Exp $
 
 PROG=  disklabel
 SRCS=  disklabel.c dkcksum.c editor.c manual.c
@@ -25,25 +25,6 @@ manual.c:    disklabel.cat8
        echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
 .endif
 
-.if ${MACHINE} == "alpha"
-CFLAGS+= -DSEEALSO="\"installboot(8)\""
-.endif
-
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "armv7" || ${MACHINE} == "arm64" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "powerpc64"
-CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\""
-.endif
-
-.if ${MACHINE} == "macppc"
-CFLAGS+= -DSEEALSO="\"fdisk(8), pdisk(8), installboot(8)\""
-.endif
-
-.if ${MACHINE} == "sparc64"
-CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DSUN_CYLCHECK -DSUN_AAT0
-.endif
-
 .ifdef NOPIC
 CFLAGS+= -DSTATICLINKING
 .endif

diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 58d0e80..15b2102 100644 (file)
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.68 2020/07/21 13:56:08 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.69 2021/06/24 21:11:40 jmc Exp $
 
 PROG=  disklabel
 SRCS=  disklabel.c dkcksum.c editor.c manual.c
@@ -25,23 +25,4 @@ manual.c:    disklabel.cat8
        echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
 .endif
 
-.if ${MACHINE} == "alpha"
-CFLAGS+= -DSEEALSO="\"installboot(8)\""
-.endif
-
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "armv7" || ${MACHINE} == "arm64" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "powerpc64"
-CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\""
-.endif
-
-.if ${MACHINE} == "macppc"
-CFLAGS+= -DSEEALSO="\"fdisk(8), pdisk(8), installboot(8)\""
-.endif
-
-.if ${MACHINE} == "sparc64"
-CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DSUN_CYLCHECK -DSUN_AAT0
-.endif
-
 .include <bsd.prog.mk>

diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 001a50f..2c59f21 100644 (file)
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: disklabel.c,v 1.236 2020/11/14 20:53:31 guenther Exp $        */
+/*     $OpenBSD: disklabel.c,v 1.237 2021/06/24 21:11:40 jmc Exp $     */
 
 /*
  * Copyright (c) 1987, 1993
@@ -1212,28 +1212,15 @@ void
 usage(void)
 {
        fprintf(stderr,
-           "usage: disklabel    [-Acdtv] [-h | -p unit] [-T file] disk\t(read)\n");
+           "usage: disklabel    [-Acdtv] [-h | -p unit] [-T file] disk\n");
        fprintf(stderr,
-           "       disklabel -w [-Acdnv] [-T file] disk disktype [packid]\t(write)\n");
+           "       disklabel -w [-Acdnv] [-T file] disk disktype [packid]\n");
        fprintf(stderr,
-           "       disklabel -e [-Acdnv] [-T file] disk\t\t\t(edit)\n");
+           "       disklabel -e [-Acdnv] [-T file] disk\n");
        fprintf(stderr,
-           "       disklabel -E [-Acdnv] [-F|-f file] [-T file] disk\t(simple editor)"
-           "\n");
+           "       disklabel -E [-Acdnv] [-F|-f file] [-T file] disk\n");
        fprintf(stderr,
-           "       disklabel -R [-nv] [-F|-f file] disk protofile\t\t(restore)\n\n");
-       fprintf(stderr,
-           "`disk' may be of the form: sd0 or /dev/rsd0%c.\n", 'a'+RAW_PART);
-       fprintf(stderr,
-           "`disktype' is an entry from %s, see disktab(5) for more info.\n",
-           DISKTAB);
-       fprintf(stderr,
-           "`packid' is an identification string for the device.\n");
-       fprintf(stderr,
-           "`protofile' is the output from the read cmd form; -R is powerful.\n");
-#ifdef SEEALSO
-       fprintf(stderr,
-           "For procedures specific to this architecture see: %s\n", SEEALSO);
-#endif
+           "       disklabel -R [-nv] [-F|-f file] disk protofile\n");
+
        exit(1);
 }