Module Name: src
Committed By: mrg
Date: Mon Apr 29 22:09:11 UTC 2024
Modified Files:
src/distrib/sets/lists/xbase: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/bin/xdm: Makefile
src/share/mk: bsd.x11.mk
Log Message:
xdm(1) was renamed xdm(8) a long while ago. catch up location.
add support for section 8 X manuals. amusingly, we already knew
to convert __adminmansuffix__ into "8", but not how to create
.8 from X .man.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.30 -r1.31 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.153 -r1.154 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.175 src/distrib/sets/lists/xbase/mi:1.176
--- src/distrib/sets/lists/xbase/mi:1.175 Thu Apr 18 19:17:14 2024
+++ src/distrib/sets/lists/xbase/mi Mon Apr 29 22:09:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.175 2024/04/18 19:17:14 jakllsch Exp $
+# $NetBSD: mi,v 1.176 2024/04/29 22:09:11 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1344,7 +1344,7 @@
./usr/X11R7/man/cat1/xconsole.0 xbase-xconsole-catman .cat,xorg
./usr/X11R7/man/cat1/xcutsel.0 xbase-xcutsel-catman .cat,xorg
./usr/X11R7/man/cat1/xditview.0 xbase-xditview-catman .cat,xorg
-./usr/X11R7/man/cat1/xdm.0 xbase-xdm-catman .cat,xorg
+./usr/X11R7/man/cat1/xdm.0 xbase-obsolete obsolete
./usr/X11R7/man/cat1/xdpyinfo.0 xbase-xdpyinfo-catman .cat,xorg
./usr/X11R7/man/cat1/xdriinfo.0 xbase-xdriinfo-catman .cat,xorg
./usr/X11R7/man/cat1/xedit.0 xbase-xedit-catman .cat,xorg
@@ -1428,6 +1428,8 @@
./usr/X11R7/man/cat7/XProjectTeam.0 xbase-x11-catman .cat,xorg
./usr/X11R7/man/cat7/Xsecurity.0 xbase-x11-catman .cat,xorg
./usr/X11R7/man/cat7/xkeyboard-config.0 xbase-xkeyboard-config-catman .cat,xorg
+./usr/X11R7/man/cat8 base-x11-root xorg
+./usr/X11R7/man/cat8/xdm.0 xbase-xdm-catman .cat,xorg
./usr/X11R7/man/html1 base-x11-root xorg
./usr/X11R7/man/html1/appres.html xbase-appres-htmlman html,xorg
./usr/X11R7/man/html1/atobm.html xbase-bitmap-htmlman html,xorg
@@ -1497,7 +1499,7 @@
./usr/X11R7/man/html1/xconsole.html xbase-xconsole-htmlman html,xorg
./usr/X11R7/man/html1/xcutsel.html xbase-xcutsel-htmlman html,xorg
./usr/X11R7/man/html1/xditview.html xbase-xditview-htmlman html,xorg
-./usr/X11R7/man/html1/xdm.html xbase-xdm-htmlman html,xorg
+./usr/X11R7/man/html1/xdm.html xbase-obsolete obsolete
./usr/X11R7/man/html1/xdpyinfo.html xbase-xdpyinfo-htmlman html,xorg
./usr/X11R7/man/html1/xdriinfo.html xbase-xdriinfo-htmlman html,xorg
./usr/X11R7/man/html1/xedit.html xbase-xedit-htmlman html,xorg
@@ -1581,6 +1583,8 @@
./usr/X11R7/man/html7/XProjectTeam.html xbase-x11-htmlman html,xorg
./usr/X11R7/man/html7/Xsecurity.html xbase-x11-htmlman html,xorg
./usr/X11R7/man/html7/xkeyboard-config.html xbase-xkeyboard-config-htmlman html,xorg
+./usr/X11R7/man/html8 base-x11-root xorg
+./usr/X11R7/man/html8/xdm.html xbase-xdm-htmlman html,xorg
./usr/X11R7/man/man1 base-x11-root xorg
./usr/X11R7/man/man1/appres.1 xbase-appres-man .man,xorg
./usr/X11R7/man/man1/atobm.1 xbase-bitmap-man .man,xorg
@@ -1651,7 +1655,7 @@
./usr/X11R7/man/man1/xconsole.1 xbase-xconsole-man .man,xorg
./usr/X11R7/man/man1/xcutsel.1 xbase-xcutsel-man .man,xorg
./usr/X11R7/man/man1/xditview.1 xbase-xditview-man .man,xorg
-./usr/X11R7/man/man1/xdm.1 xbase-xdm-man .man,xorg
+./usr/X11R7/man/man1/xdm.1 xbase-obsolete obsolete
./usr/X11R7/man/man1/xdpyinfo.1 xbase-xdpyinfo-man .man,xorg
./usr/X11R7/man/man1/xdriinfo.1 xbase-xdriinfo-man .man,xorg
./usr/X11R7/man/man1/xedit.1 xbase-xedit-man .man,xorg
@@ -1735,6 +1739,8 @@
./usr/X11R7/man/man7/XProjectTeam.7 xbase-x11-man .man,xorg
./usr/X11R7/man/man7/Xsecurity.7 xbase-x11-man .man,xorg
./usr/X11R7/man/man7/xkeyboard-config.7 xbase-xkeyboard-config-man .man,xorg
+./usr/X11R7/man/man8 base-x11-root xorg
+./usr/X11R7/man/man8/xdm.8 xbase-xdm-man .man,xorg
./usr/X11R7/man/whatis.db xbase-x11-man man,xorg,!makemandb
./usr/X11R7/share base-x11-root xorg
./usr/X11R7/share/aclocal base-x11-root xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.30 src/etc/mtree/NetBSD.dist.Xorg:1.31
--- src/etc/mtree/NetBSD.dist.Xorg:1.30 Thu Jul 14 06:53:40 2022
+++ src/etc/mtree/NetBSD.dist.Xorg Mon Apr 29 22:09:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.30 2022/07/14 06:53:40 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.31 2024/04/29 22:09:11 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -163,6 +163,7 @@
./usr/X11R7/man/cat4/x86
./usr/X11R7/man/cat5
./usr/X11R7/man/cat7
+./usr/X11R7/man/cat8
./usr/X11R7/man/html1
./usr/X11R7/man/html3
./usr/X11R7/man/html4
@@ -170,6 +171,7 @@
./usr/X11R7/man/html4/x86
./usr/X11R7/man/html5
./usr/X11R7/man/html7
+./usr/X11R7/man/html8
./usr/X11R7/man/man1
./usr/X11R7/man/man3
./usr/X11R7/man/man4
@@ -177,6 +179,7 @@
./usr/X11R7/man/man4/x86
./usr/X11R7/man/man5
./usr/X11R7/man/man7
+./usr/X11R7/man/man8
./usr/X11R7/share
./usr/X11R7/share/aclocal
./usr/X11R7/share/examples
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.19 src/external/mit/xorg/bin/xdm/Makefile:1.20
--- src/external/mit/xorg/bin/xdm/Makefile:1.19 Fri Aug 19 15:55:36 2022
+++ src/external/mit/xorg/bin/xdm/Makefile Mon Apr 29 22:09:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/08/19 15:55:36 nia Exp $
+# $NetBSD: Makefile,v 1.20 2024/04/29 22:09:11 mrg Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@ SRCS= access.c auth.c choose.c daemon.c
error.c file.c genauth.c mitauth.c netaddr.c policy.c \
protodpy.c reset.c resource.c server.c session.c socket.c \
util.c xdmauth.c xdmcp.c prngc.c
+MAN= xdm.8
.if ${MKPIC} == "no"
SRCS+= Login.c greet.c verify.c
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.153 src/share/mk/bsd.x11.mk:1.154
--- src/share/mk/bsd.x11.mk:1.153 Sun Apr 7 14:36:23 2024
+++ src/share/mk/bsd.x11.mk Mon Apr 29 22:09:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.153 2024/04/07 14:36:23 tsutsui Exp $
+# $NetBSD: bsd.x11.mk,v 1.154 2024/04/29 22:09:10 mrg Exp $
.include <bsd.init.mk>
@@ -400,7 +400,7 @@ realinstall: appdefsinstall
CLEANDIRFILES+= ${MAN:U${PROG:D${PROG.1}}}
.endif # }
-.SUFFIXES: .man .man.pre .1 .3 .4 .5 .7
+.SUFFIXES: .man .man.pre .1 .3 .4 .5 .7 .8
# Note the escaping trick for _X11MANTRANSFORM using % to replace spaces
XORGVERSION= '"X Version 11"'
@@ -463,7 +463,7 @@ _X11MANTRANSFORMCMD+= -e s,${__def__},${
.endif
_X11MANTRANSFORMCMD+= ${X11EXTRAMANDEFS}
-.man.1 .man.3 .man.4 .man.5 .man.7 .man.pre.1 .man.pre.4 .man.pre.5:
+.man.1 .man.3 .man.4 .man.5 .man.7 .man.8 .man.pre.1 .man.pre.4 .man.pre.5:
${_MKTARGET_CREATE}
rm -f ${.TARGET}
${_X11MANTRANSFORMCMD} | ${X11TOOL_UNXCOMM} > ${.TARGET}.tmp
