From ac81be68d2e663d6f83f64a1c4c29878974919ca Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 11 Jul 2022 03:11:49 +0000 Subject: [PATCH] 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@ --- games/phantasia/Makefile | 7 ++----- games/phantasia/{phantasia.6tbl => phantasia.6} | 4 ++-- gnu/usr.sbin/mkhybrid/mkhybrid/Makefile | 6 +----- gnu/usr.sbin/mkhybrid/src/{mkhybrid.8tbl => mkhybrid.8} | 2 +- share/man/man4/Makefile | 7 +------ share/man/man4/man4.hppa/Makefile | 6 +----- share/man/man4/man4.hppa/{cpu.4tbl => cpu.4} | 4 ++-- share/man/man4/{wi.4tbl => wi.4} | 4 ++-- usr.bin/infocmp/Makefile | 7 ++----- usr.bin/infocmp/{infocmp.1tbl => infocmp.1} | 4 ++-- usr.bin/tic/Makefile | 7 ++----- usr.bin/tic/{captoinfo.1tbl => captoinfo.1} | 4 ++-- 12 files changed, 20 insertions(+), 42 deletions(-) rename games/phantasia/{phantasia.6tbl => phantasia.6} (99%) rename gnu/usr.sbin/mkhybrid/src/{mkhybrid.8tbl => mkhybrid.8} (99%) rename share/man/man4/man4.hppa/{cpu.4tbl => cpu.4} (98%) rename share/man/man4/{wi.4tbl => wi.4} (99%) rename usr.bin/infocmp/{infocmp.1tbl => infocmp.1} (99%) rename usr.bin/tic/{captoinfo.1tbl => captoinfo.1} (98%) diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile index 60eceef72f1..af9c7da959e 100644 --- a/games/phantasia/Makefile +++ b/games/phantasia/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2015/11/24 03:10:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.19 2022/07/11 03:11:49 daniel Exp $ PROG= phantasia SRCS= main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c @@ -6,7 +6,7 @@ CFLAGS+=-DTERMIOS DPADD= ${LIBM} ${LIBCURSES} LDADD= -lm -lcurses MAN= phantasia.6 -CLEANFILES+=map setup setup.o phantglobs.o.bld phantasia.6 +CLEANFILES+=map setup setup.o phantglobs.o.bld all: setup phantasia @@ -20,9 +20,6 @@ setup: phantglobs.o.bld setup.o monsters.asc ${DPADD} ${HOSTCC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} \ phantglobs.o.bld setup.o ${LDADD} -phantasia.6: phantasia.6tbl - cp ${.ALLSRC} ${.TARGET} - beforeinstall: ./setup -m ${.CURDIR}/monsters.asc chown root:games ${DESTDIR}/var/games/phantasia/* diff --git a/games/phantasia/phantasia.6tbl b/games/phantasia/phantasia.6 similarity index 99% rename from games/phantasia/phantasia.6tbl rename to games/phantasia/phantasia.6 index 15c3acc35bd..fcee4511aeb 100644 --- a/games/phantasia/phantasia.6tbl +++ b/games/phantasia/phantasia.6 @@ -1,7 +1,7 @@ -.\" $OpenBSD: phantasia.6tbl,v 1.12 2022/03/31 17:27:15 naddy Exp $ +.\" $OpenBSD: phantasia.6,v 1.3 2022/07/11 03:11:49 daniel Exp $ .\" $NetBSD: phantasia.6,v 1.9 2002/09/26 18:32:03 wiz Exp $ .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: July 11 2022 $ .Dt PHANTASIA 6 .Os .Sh NAME diff --git a/gnu/usr.sbin/mkhybrid/mkhybrid/Makefile b/gnu/usr.sbin/mkhybrid/mkhybrid/Makefile index 83317bdbceb..ace7095aa87 100644 --- a/gnu/usr.sbin/mkhybrid/mkhybrid/Makefile +++ b/gnu/usr.sbin/mkhybrid/mkhybrid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/09/09 20:02:31 miod Exp $ +# $OpenBSD: Makefile,v 1.8 2022/07/11 03:11:49 daniel Exp $ # NOTE: The mkhybrid distrib also makes an "mkisofs" which is the same binary # linked. When we know mkhybrid makes distrib CDs ok we should modify this @@ -8,7 +8,6 @@ PROG= mkhybrid MAN= mkhybrid.8 BINDIR= /usr/sbin -CLEANFILES+= mkhybrid.8 .PATH: ${.CURDIR}/../src ${.CURDIR}/../src/libhfs_iso ${.CURDIR}/../src/libfile SRCS= data.c block.c low.c lfile.c btree.c node.c record.c lvolume.c \ @@ -21,7 +20,4 @@ CFLAGS+=-DSYSTEM_ID_DEFAULT=\"OpenBSD\" -DAPPLE_HYB -DVANILLA_AUTOCONF \ -I${.CURDIR}/../src/libhfs_iso \ -I${.CURDIR}/../src/libfile -mkhybrid.8: mkhybrid.8tbl - cp ${.ALLSRC} ${.TARGET} - .include diff --git a/gnu/usr.sbin/mkhybrid/src/mkhybrid.8tbl b/gnu/usr.sbin/mkhybrid/src/mkhybrid.8 similarity index 99% rename from gnu/usr.sbin/mkhybrid/src/mkhybrid.8tbl rename to gnu/usr.sbin/mkhybrid/src/mkhybrid.8 index b5d113843ad..884b3127fec 100644 --- a/gnu/usr.sbin/mkhybrid/src/mkhybrid.8tbl +++ b/gnu/usr.sbin/mkhybrid/src/mkhybrid.8 @@ -2,7 +2,7 @@ .\" To print, first run through tbl .\" -*- nroff -*- .\" -.\" $Id: mkhybrid.8tbl,v 1.6 2022/06/28 04:36:30 jsg Exp $ +.\" $Id: mkhybrid.8,v 1.4 2022/07/11 03:11:49 daniel Exp $ .\" .TH MKHYBRID 8 "7 April 1999" "Version 1.12b5.1" .SH NAME 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 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 diff --git a/share/man/man4/man4.hppa/cpu.4tbl b/share/man/man4/man4.hppa/cpu.4 similarity index 98% rename from share/man/man4/man4.hppa/cpu.4tbl rename to 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 similarity index 99% rename from share/man/man4/wi.4tbl rename to 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 . 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 diff --git a/usr.bin/infocmp/Makefile b/usr.bin/infocmp/Makefile index bda61701d75..315cbbad0ce 100644 --- a/usr.bin/infocmp/Makefile +++ b/usr.bin/infocmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/12/21 21:40:01 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2022/07/11 03:11:49 daniel Exp $ PROG= infocmp SRCS= infocmp.c dump_entry.c @@ -7,7 +7,7 @@ LDADD= -lcurses CURSES= ${.CURDIR}/../../lib/libcurses TIC= ${.CURDIR}/../tic CFLAGS+= -I${CURSES} -I${TIC} -I${.CURDIR} -I. -CLEANFILES+= termsort.c infocmp.1 +CLEANFILES+= termsort.c .PATH: ${TIC} dump_entry.o: termsort.c @@ -15,7 +15,4 @@ dump_entry.o: termsort.c termsort.c: ${TIC}/MKtermsort.sh sh ${TIC}/MKtermsort.sh awk ${CURSES}/Caps > ${.TARGET} -infocmp.1: infocmp.1tbl - cp ${.ALLSRC} ${.TARGET} - .include diff --git a/usr.bin/infocmp/infocmp.1tbl b/usr.bin/infocmp/infocmp.1 similarity index 99% rename from usr.bin/infocmp/infocmp.1tbl rename to usr.bin/infocmp/infocmp.1 index 947d4f0aabb..90142531ca0 100644 --- a/usr.bin/infocmp/infocmp.1tbl +++ b/usr.bin/infocmp/infocmp.1 @@ -1,5 +1,5 @@ '\" t -.\" $OpenBSD: infocmp.1tbl,v 1.11 2010/01/12 23:22:13 nicm Exp $ +.\" $OpenBSD: infocmp.1,v 1.1 2022/07/11 03:11:49 daniel Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * @@ -29,7 +29,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: infocmp.1tbl,v 1.11 2010/01/12 23:22:13 nicm Exp $ +.\" $Id: infocmp.1,v 1.1 2022/07/11 03:11:49 daniel Exp $ .TH infocmp 1 "" .ds n 5 .ds d /usr/share/terminfo diff --git a/usr.bin/tic/Makefile b/usr.bin/tic/Makefile index 577f9acbe83..d5dcfec0767 100644 --- a/usr.bin/tic/Makefile +++ b/usr.bin/tic/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2019/12/21 21:40:01 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2022/07/11 03:11:49 daniel Exp $ PROG= tic SRCS= dump_entry.c tic.c @@ -8,7 +8,7 @@ DPADD= ${LIBCURSES} LDADD= -lcurses CURSES= ${.CURDIR}/../../lib/libcurses CFLAGS+= -I${CURSES} -I${.CURDIR} -I. -CLEANFILES+= termsort.c captoinfo.1 +CLEANFILES+= termsort.c # Work around gcc optimization bug on sh .if (${MACHINE_ARCH} == sh) @@ -20,7 +20,4 @@ dump_entry.o: termsort.c termsort.c: MKtermsort.sh sh ${.CURDIR}/MKtermsort.sh awk ${CURSES}/Caps > ${.TARGET} -captoinfo.1: captoinfo.1tbl - cp ${.ALLSRC} ${.TARGET} - .include diff --git a/usr.bin/tic/captoinfo.1tbl b/usr.bin/tic/captoinfo.1 similarity index 98% rename from usr.bin/tic/captoinfo.1tbl rename to usr.bin/tic/captoinfo.1 index d412190e0cf..ee563e6852f 100644 --- a/usr.bin/tic/captoinfo.1tbl +++ b/usr.bin/tic/captoinfo.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: captoinfo.1tbl,v 1.8 2010/01/12 23:22:14 nicm Exp $ +.\" $OpenBSD: captoinfo.1,v 1.1 2022/07/11 03:11:49 daniel Exp $ .\"*************************************************************************** .\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * .\" * @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: captoinfo.1tbl,v 1.8 2010/01/12 23:22:14 nicm Exp $ +.\" $Id: captoinfo.1,v 1.1 2022/07/11 03:11:49 daniel Exp $ .TH captoinfo 1 "" .ds n 5 .ds d /usr/share/misc/terminfo -- 2.20.1