Re: apm, apmd: ship manual pages on powerpc64
On Sun, Mar 21, 2021 at 01:24:49PM +0100, Klemens Nanni wrote: > On Sun, Mar 21, 2021 at 06:50:23AM +, Jason McIntyre wrote: > > On Sat, Mar 20, 2021 at 07:29:11PM -0600, Theo de Raadt wrote: > > > There is a pattern we've followed in the past, that when a manpage applies > > > to more than 2 (or 3?) architectures, then we simply make it MI. > > > > > > So MANSUBDIR would get deleted, and then the sets would be updated. > That makes sense. > > > > People with old systems will retain the old files, but I think man(1) > > > selects the MI ones over the MD ones (I think we have no override > > > capability). > > > > > > > man chooses the MD page over the MI page, i think. from man(1): > > > > Machine specific areas are searched before general areas. > > > > so you'd get the old page unless you deleted it. i don;t know if you can > > override that. > Isn't that what we have current.html and sysclean(1) for? > > If so, I'd commit the following and mention the MD manuals for removal > in current.html just like we do when removing old files after upgrading > perl or so. > > Feedback? OK? Ping. Here's both the apm and current.html diff. Index: usr.sbin/apm/Makefile === RCS file: /cvs/src/usr.sbin/apm/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- usr.sbin/apm/Makefile 15 Jul 2020 22:46:52 - 1.19 +++ usr.sbin/apm/Makefile 21 Mar 2021 12:21:33 - @@ -19,6 +19,5 @@ NOPROG=yes .endif MAN= apm.8 -MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 .include Index: usr.sbin/apmd/Makefile === RCS file: /cvs/src/usr.sbin/apmd/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- usr.sbin/apmd/Makefile 15 Jul 2020 22:46:52 - 1.15 +++ usr.sbin/apmd/Makefile 21 Mar 2021 12:23:15 - @@ -13,6 +13,5 @@ NOPROG=yes .endif MAN= apmd.8 -MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 .include Index: distrib/sets/lists/man/mi === RCS file: /cvs/src/distrib/sets/lists/man/mi,v retrieving revision 1.1616 diff -u -p -r1.1616 mi --- distrib/sets/lists/man/mi 1 Mar 2021 23:26:59 - 1.1616 +++ distrib/sets/lists/man/mi 21 Mar 2021 12:21:03 - @@ -2296,8 +2296,6 @@ ./usr/share/man/man8/alpha/setnetbootinfo.8 ./usr/share/man/man8/amd.8 ./usr/share/man/man8/amd64/MAKEDEV.8 -./usr/share/man/man8/amd64/apm.8 -./usr/share/man/man8/amd64/apmd.8 ./usr/share/man/man8/amd64/biosboot.8 ./usr/share/man/man8/amd64/boot.8 ./usr/share/man/man8/amd64/boot_amd64.8 @@ -2307,9 +2305,9 @@ ./usr/share/man/man8/amd64/memconfig.8 ./usr/share/man/man8/amd64/pxeboot.8 ./usr/share/man/man8/amq.8 +./usr/share/man/man8/apm.8 +./usr/share/man/man8/apmd.8 ./usr/share/man/man8/arm64/MAKEDEV.8 -./usr/share/man/man8/arm64/apm.8 -./usr/share/man/man8/arm64/apmd.8 ./usr/share/man/man8/arm64/eeprom.8 ./usr/share/man/man8/arm64/gpioctl.8 ./usr/share/man/man8/armv7/MAKEDEV.8 @@ -2383,8 +2381,6 @@ ./usr/share/man/man8/hppa/mkboot.8 ./usr/share/man/man8/httpd.8 ./usr/share/man/man8/i386/MAKEDEV.8 -./usr/share/man/man8/i386/apm.8 -./usr/share/man/man8/i386/apmd.8 ./usr/share/man/man8/i386/biosboot.8 ./usr/share/man/man8/i386/boot.8 ./usr/share/man/man8/i386/boot_i386.8 @@ -2431,15 +2427,11 @@ ./usr/share/man/man8/login_token.8 ./usr/share/man/man8/login_yubikey.8 ./usr/share/man/man8/loongson/MAKEDEV.8 -./usr/share/man/man8/loongson/apm.8 -./usr/share/man/man8/loongson/apmd.8 ./usr/share/man/man8/lpc.8 ./usr/share/man/man8/lpd.8 ./usr/share/man/man8/luna88k/MAKEDEV.8 ./usr/share/man/man8/luna88k/boot_luna88k.8 ./usr/share/man/man8/macppc/MAKEDEV.8 -./usr/share/man/man8/macppc/apm.8 -./usr/share/man/man8/macppc/apmd.8 ./usr/share/man/man8/macppc/boot.8 ./usr/share/man/man8/macppc/boot_macppc.8 ./usr/share/man/man8/macppc/eeprom.8 @@ -2583,8 +2575,6 @@ ./usr/share/man/man8/spamdb.8 ./usr/share/man/man8/spamlogd.8 ./usr/share/man/man8/sparc64/MAKEDEV.8 -./usr/share/man/man8/sparc64/apm.8 -./usr/share/man/man8/sparc64/apmd.8 ./usr/share/man/man8/sparc64/boot_sparc64.8 ./usr/share/man/man8/sparc64/eeprom.8 ./usr/share/man/man8/sparc64/ldomctl.8 Index: current.html === RCS file: /cvs/www/faq/current.html,v retrieving revision 1.1067 diff -u -p -r1.1067 current.html --- current.html12 Mar 2021 17:23:14 - 1.1067 +++ current.html25 Mar 2021 19:04:33 - @@ -274,6 +274,29 @@ RFC 8981 changed the terminology from pr temporary. +2021/03/25 - apm manual pages moved from MD to MI MANPATH + +https://man.openbsd.org/apm.8";>apm(8) and +https://man.openbsd.org/apmd.8";>apmd(8) are now installed machine +independently and the old machine-dependent manual pages should be removed. + + +# rm /usr/share/man/man8/amd64/apm.8 \ + /usr/share
Re: apm, apmd: ship manual pages on powerpc64
Jason McIntyre wrote: > On Sat, Mar 20, 2021 at 07:29:11PM -0600, Theo de Raadt wrote: > > There is a pattern we've followed in the past, that when a manpage applies > > to more than 2 (or 3?) architectures, then we simply make it MI. > > > > So MANSUBDIR would get deleted, and then the sets would be updated. > > > > People with old systems will retain the old files, but I think man(1) > > selects the MI ones over the MD ones (I think we have no override > > capability). > > > > man chooses the MD page over the MI page, i think. from man(1): > > Machine specific areas are searched before general areas. > > so you'd get the old page unless you deleted it. i don;t know if you can > override that. oh well, eventually people reinstall. noone is going to get severely hurt because old pages are lying around, we've been here before with far more important pages, and barreled though anyways, because it makes the build system simpler.
Re: apm, apmd: ship manual pages on powerpc64
On Sun, Mar 21, 2021 at 06:50:23AM +, Jason McIntyre wrote: > On Sat, Mar 20, 2021 at 07:29:11PM -0600, Theo de Raadt wrote: > > There is a pattern we've followed in the past, that when a manpage applies > > to more than 2 (or 3?) architectures, then we simply make it MI. > > > > So MANSUBDIR would get deleted, and then the sets would be updated. That makes sense. > > People with old systems will retain the old files, but I think man(1) > > selects the MI ones over the MD ones (I think we have no override > > capability). > > > > man chooses the MD page over the MI page, i think. from man(1): > > Machine specific areas are searched before general areas. > > so you'd get the old page unless you deleted it. i don;t know if you can > override that. Isn't that what we have current.html and sysclean(1) for? If so, I'd commit the following and mention the MD manuals for removal in current.html just like we do when removing old files after upgrading perl or so. Feedback? OK? Index: usr.sbin/apm/Makefile === RCS file: /cvs/src/usr.sbin/apm/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- usr.sbin/apm/Makefile 15 Jul 2020 22:46:52 - 1.19 +++ usr.sbin/apm/Makefile 21 Mar 2021 12:21:33 - @@ -19,6 +19,5 @@ NOPROG=yes .endif MAN= apm.8 -MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 .include Index: usr.sbin/apmd/Makefile === RCS file: /cvs/src/usr.sbin/apmd/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- usr.sbin/apmd/Makefile 15 Jul 2020 22:46:52 - 1.15 +++ usr.sbin/apmd/Makefile 21 Mar 2021 12:23:15 - @@ -13,6 +13,5 @@ NOPROG=yes .endif MAN= apmd.8 -MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 .include Index: distrib/sets/lists/man/mi === RCS file: /cvs/src/distrib/sets/lists/man/mi,v retrieving revision 1.1616 diff -u -p -r1.1616 mi --- distrib/sets/lists/man/mi 1 Mar 2021 23:26:59 - 1.1616 +++ distrib/sets/lists/man/mi 21 Mar 2021 12:21:03 - @@ -2296,8 +2296,6 @@ ./usr/share/man/man8/alpha/setnetbootinfo.8 ./usr/share/man/man8/amd.8 ./usr/share/man/man8/amd64/MAKEDEV.8 -./usr/share/man/man8/amd64/apm.8 -./usr/share/man/man8/amd64/apmd.8 ./usr/share/man/man8/amd64/biosboot.8 ./usr/share/man/man8/amd64/boot.8 ./usr/share/man/man8/amd64/boot_amd64.8 @@ -2307,9 +2305,9 @@ ./usr/share/man/man8/amd64/memconfig.8 ./usr/share/man/man8/amd64/pxeboot.8 ./usr/share/man/man8/amq.8 +./usr/share/man/man8/apm.8 +./usr/share/man/man8/apmd.8 ./usr/share/man/man8/arm64/MAKEDEV.8 -./usr/share/man/man8/arm64/apm.8 -./usr/share/man/man8/arm64/apmd.8 ./usr/share/man/man8/arm64/eeprom.8 ./usr/share/man/man8/arm64/gpioctl.8 ./usr/share/man/man8/armv7/MAKEDEV.8 @@ -2383,8 +2381,6 @@ ./usr/share/man/man8/hppa/mkboot.8 ./usr/share/man/man8/httpd.8 ./usr/share/man/man8/i386/MAKEDEV.8 -./usr/share/man/man8/i386/apm.8 -./usr/share/man/man8/i386/apmd.8 ./usr/share/man/man8/i386/biosboot.8 ./usr/share/man/man8/i386/boot.8 ./usr/share/man/man8/i386/boot_i386.8 @@ -2431,15 +2427,11 @@ ./usr/share/man/man8/login_token.8 ./usr/share/man/man8/login_yubikey.8 ./usr/share/man/man8/loongson/MAKEDEV.8 -./usr/share/man/man8/loongson/apm.8 -./usr/share/man/man8/loongson/apmd.8 ./usr/share/man/man8/lpc.8 ./usr/share/man/man8/lpd.8 ./usr/share/man/man8/luna88k/MAKEDEV.8 ./usr/share/man/man8/luna88k/boot_luna88k.8 ./usr/share/man/man8/macppc/MAKEDEV.8 -./usr/share/man/man8/macppc/apm.8 -./usr/share/man/man8/macppc/apmd.8 ./usr/share/man/man8/macppc/boot.8 ./usr/share/man/man8/macppc/boot_macppc.8 ./usr/share/man/man8/macppc/eeprom.8 @@ -2583,8 +2575,6 @@ ./usr/share/man/man8/spamdb.8 ./usr/share/man/man8/spamlogd.8 ./usr/share/man/man8/sparc64/MAKEDEV.8 -./usr/share/man/man8/sparc64/apm.8 -./usr/share/man/man8/sparc64/apmd.8 ./usr/share/man/man8/sparc64/boot_sparc64.8 ./usr/share/man/man8/sparc64/eeprom.8 ./usr/share/man/man8/sparc64/ldomctl.8
Re: apm, apmd: ship manual pages on powerpc64
On Sat, Mar 20, 2021 at 07:29:11PM -0600, Theo de Raadt wrote: > There is a pattern we've followed in the past, that when a manpage applies > to more than 2 (or 3?) architectures, then we simply make it MI. > > So MANSUBDIR would get deleted, and then the sets would be updated. > > People with old systems will retain the old files, but I think man(1) > selects the MI ones over the MD ones (I think we have no override capability). > man chooses the MD page over the MI page, i think. from man(1): Machine specific areas are searched before general areas. so you'd get the old page unless you deleted it. i don;t know if you can override that. jmc > Klemens Nanni wrote: > > > It looks like an oversight when those were hooked up, but I don't have > > access to that platform to test myself. > > > > Feedback? OK? > > > > Index: usr.sbin/apm/Makefile > > === > > RCS file: /cvs/src/usr.sbin/apm/Makefile,v > > retrieving revision 1.19 > > diff -u -p -r1.19 Makefile > > --- usr.sbin/apm/Makefile 15 Jul 2020 22:46:52 - 1.19 > > +++ usr.sbin/apm/Makefile 20 Mar 2021 20:57:23 - > > @@ -19,6 +19,6 @@ NOPROG=yes > > .endif > > > > MAN= apm.8 > > -MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 > > +MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 powerpc64 > > > > .include > > Index: usr.sbin/apmd/Makefile > > === > > RCS file: /cvs/src/usr.sbin/apmd/Makefile,v > > retrieving revision 1.15 > > diff -u -p -r1.15 Makefile > > --- usr.sbin/apmd/Makefile 15 Jul 2020 22:46:52 - 1.15 > > +++ usr.sbin/apmd/Makefile 20 Mar 2021 21:00:37 - > > @@ -13,6 +13,6 @@ NOPROG=yes > > .endif > > > > MAN= apmd.8 > > -MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 > > +MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 powerpc64 > > > > .include > > Index: distrib/sets/lists/man/mi > > === > > RCS file: /cvs/src/distrib/sets/lists/man/mi,v > > retrieving revision 1.1616 > > diff -u -p -r1.1616 mi > > --- distrib/sets/lists/man/mi 1 Mar 2021 23:26:59 - 1.1616 > > +++ distrib/sets/lists/man/mi 20 Mar 2021 21:00:15 - > > @@ -2511,6 +2511,8 @@ > > ./usr/share/man/man8/pkg_check.8 > > ./usr/share/man/man8/portmap.8 > > ./usr/share/man/man8/powerpc64/MAKEDEV.8 > > +./usr/share/man/man8/powerpc64/apm.8 > > +./usr/share/man/man8/powerpc64/apmd.8 > > ./usr/share/man/man8/powerpc64/eeprom.8 > > ./usr/share/man/man8/pppd.8 > > ./usr/share/man/man8/pppstats.8 > > >
Re: apm, apmd: ship manual pages on powerpc64
There is a pattern we've followed in the past, that when a manpage applies to more than 2 (or 3?) architectures, then we simply make it MI. So MANSUBDIR would get deleted, and then the sets would be updated. People with old systems will retain the old files, but I think man(1) selects the MI ones over the MD ones (I think we have no override capability). Klemens Nanni wrote: > It looks like an oversight when those were hooked up, but I don't have > access to that platform to test myself. > > Feedback? OK? > > Index: usr.sbin/apm/Makefile > === > RCS file: /cvs/src/usr.sbin/apm/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- usr.sbin/apm/Makefile 15 Jul 2020 22:46:52 - 1.19 > +++ usr.sbin/apm/Makefile 20 Mar 2021 20:57:23 - > @@ -19,6 +19,6 @@ NOPROG=yes > .endif > > MAN= apm.8 > -MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 > +MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 powerpc64 > > .include > Index: usr.sbin/apmd/Makefile > === > RCS file: /cvs/src/usr.sbin/apmd/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- usr.sbin/apmd/Makefile15 Jul 2020 22:46:52 - 1.15 > +++ usr.sbin/apmd/Makefile20 Mar 2021 21:00:37 - > @@ -13,6 +13,6 @@ NOPROG=yes > .endif > > MAN= apmd.8 > -MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 > +MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 powerpc64 > > .include > Index: distrib/sets/lists/man/mi > === > RCS file: /cvs/src/distrib/sets/lists/man/mi,v > retrieving revision 1.1616 > diff -u -p -r1.1616 mi > --- distrib/sets/lists/man/mi 1 Mar 2021 23:26:59 - 1.1616 > +++ distrib/sets/lists/man/mi 20 Mar 2021 21:00:15 - > @@ -2511,6 +2511,8 @@ > ./usr/share/man/man8/pkg_check.8 > ./usr/share/man/man8/portmap.8 > ./usr/share/man/man8/powerpc64/MAKEDEV.8 > +./usr/share/man/man8/powerpc64/apm.8 > +./usr/share/man/man8/powerpc64/apmd.8 > ./usr/share/man/man8/powerpc64/eeprom.8 > ./usr/share/man/man8/pppd.8 > ./usr/share/man/man8/pppstats.8 >
apm, apmd: ship manual pages on powerpc64
It looks like an oversight when those were hooked up, but I don't have access to that platform to test myself. Feedback? OK? Index: usr.sbin/apm/Makefile === RCS file: /cvs/src/usr.sbin/apm/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- usr.sbin/apm/Makefile 15 Jul 2020 22:46:52 - 1.19 +++ usr.sbin/apm/Makefile 20 Mar 2021 20:57:23 - @@ -19,6 +19,6 @@ NOPROG=yes .endif MAN= apm.8 -MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 +MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 powerpc64 .include Index: usr.sbin/apmd/Makefile === RCS file: /cvs/src/usr.sbin/apmd/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- usr.sbin/apmd/Makefile 15 Jul 2020 22:46:52 - 1.15 +++ usr.sbin/apmd/Makefile 20 Mar 2021 21:00:37 - @@ -13,6 +13,6 @@ NOPROG=yes .endif MAN= apmd.8 -MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 +MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 powerpc64 .include Index: distrib/sets/lists/man/mi === RCS file: /cvs/src/distrib/sets/lists/man/mi,v retrieving revision 1.1616 diff -u -p -r1.1616 mi --- distrib/sets/lists/man/mi 1 Mar 2021 23:26:59 - 1.1616 +++ distrib/sets/lists/man/mi 20 Mar 2021 21:00:15 - @@ -2511,6 +2511,8 @@ ./usr/share/man/man8/pkg_check.8 ./usr/share/man/man8/portmap.8 ./usr/share/man/man8/powerpc64/MAKEDEV.8 +./usr/share/man/man8/powerpc64/apm.8 +./usr/share/man/man8/powerpc64/apmd.8 ./usr/share/man/man8/powerpc64/eeprom.8 ./usr/share/man/man8/pppd.8 ./usr/share/man/man8/pppstats.8
