remove the "tbl" suffix for a few man pages

Over a decade ago, the build infrastructure had special logic to process
man pages that ended with the suffix "tbl".

This infrastructure is long gone and the special naming for these man pages
is no longer needed.

Revert the naming of these man pages for consistency with all other man
pages in the tree. As a bonus, we remove a few lines from some of the
Makefiles making them simpler.

ok jmc@, and no objection from schwarze@

4 files changed, 6 insertions, 15 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 9c2d00569c3..02339cede0f 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.817 2022/01/18 07:53:39 visa Exp $
+#	$OpenBSD: Makefile,v 1.818 2022/07/11 03:11:49 daniel Exp $
 
 MAN=	aac.4 abcrtc.4 abl.4 ac97.4 acphy.4 acrtc.4 \
 	acpi.4 acpiac.4 acpials.4 acpiasus.4 acpibat.4 \
@@ -113,9 +113,4 @@ SUBDIR=	man4.alpha man4.amd64 man4.arm64 man4.armv7 \
 	man4.hppa man4.i386 man4.landisk man4.loongson man4.luna88k \
 	man4.macppc man4.octeon man4.powerpc64 man4.riscv64 man4.sparc64
 
-CLEANFILES+= wi.4
-
-wi.4: wi.4tbl
-	cp ${.ALLSRC} ${.TARGET}
-
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.hppa/Makefile b/share/man/man4/man4.hppa/Makefile
index fcdaa64597b..ec294dc7b7d 100644
--- a/share/man/man4/man4.hppa/Makefile
+++ b/share/man/man4/man4.hppa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2016/03/30 06:38:44 jmc Exp $
+#	$OpenBSD: Makefile,v 1.30 2022/07/11 03:11:49 daniel Exp $
 
 MAN=	asp.4 astro.4 cpu.4 dino.4 elroy.4
 MAN+=	gecko.4 gsc.4 gsckbc.4
@@ -6,9 +6,5 @@ MAN+=	harmony.4 ie.4 intro.4 io.4 lasi.4 lcd.4 mem.4 mongoose.4 pdc.4
 MAN+=	phantomas.4 power.4 runway.4 ssio.4 uturn.4 wax.4
 # tir.4 xbar.4 mcx.4
 MANSUBDIR=hppa
-CLEANFILES+= cpu.4
-
-cpu.4: cpu.4tbl
-	cp ${.ALLSRC} ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.hppa/cpu.4tbl b/share/man/man4/man4.hppa/cpu.4
index 44cb336d7c4..e40e156fed9 100644
--- a/share/man/man4/man4.hppa/cpu.4tbl
+++ b/share/man/man4/man4.hppa/cpu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cpu.4tbl,v 1.27 2014/02/14 14:48:51 schwarze Exp $
+.\" $OpenBSD: cpu.4,v 1.1 2022/07/11 03:11:49 daniel Exp $
 .\"
 .\" Copyright (c) 2002 Michael Shalayeff
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 14 2014 $
+.Dd $Mdocdate: July 11 2022 $
 .Dt CPU 4 hppa
 .Os
 .Sh NAME
diff --git a/share/man/man4/wi.4tbl b/share/man/man4/wi.4
index 8b945ea7463..ac98ccbaaf3 100644
--- a/share/man/man4/wi.4tbl
+++ b/share/man/man4/wi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wi.4tbl,v 1.100 2021/10/17 02:03:39 kn Exp $
+.\"	$OpenBSD: wi.4,v 1.29 2022/07/11 03:11:49 daniel Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	$FreeBSD: wi.4,v 1.3 1999/05/22 16:12:43 wpaul Exp $
 .\"
-.Dd $Mdocdate: October 17 2021 $
+.Dd $Mdocdate: July 11 2022 $
 .Dt WI 4
 .Os
 .Sh NAME