[src/trunk]: src/external/mit/xorg/server/drivers obsolete several xorg-serve...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/332db1d9e620
branches:  trunk
changeset: 373764:332db1d9e620
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 27 00:34:11 2023 +0000

description:
obsolete several xorg-server.old configurations and normalise some comments.

diffstat:

 external/mit/xorg/server/drivers/Makefile |  57 ++++++++++++++++--------------
 1 files changed, 30 insertions(+), 27 deletions(-)

diffs (136 lines):

diff -r 9ed3c5bf71a7 -r 332db1d9e620 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Sun Feb 26 22:55:02 2023 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Mon Feb 27 00:34:11 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.108 2022/07/15 19:12:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.109 2023/02/27 00:34:11 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -115,19 +115,17 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "amiga"
 
-# needs porting for xorg-server 21.1.3
-#      xf86-video-s3
 .if ${MACHINE} == "bebox"
 SUBDIR+= \
        xf86-video-cirrus \
        xf86-video-mga \
        xf86-video-s3virge
-.endif # ${MACHINE} == "bebox"
 
 # needs porting for xorg-server 21.1.3
 #      xf86-video-s3
-#      xf86-video-tga
-#      xf86-video-trident
+
+.endif # ${MACHINE} == "bebox"
+
 .if ${MACHINE} == "cats"
 SUBDIR+= \
        xf86-video-ast \
@@ -147,12 +145,17 @@
        xf86-video-tseng \
        xf86-video-vesa \
        xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+#      xf86-video-s3
+#      xf86-video-tga
+#      xf86-video-trident
+
 # needs porting for xorg-server 1.18
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-       xf86-video-apm \
-       xf86-video-ark \
-       xf86-video-glint
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+#      xf86-video-apm \
+#      xf86-video-ark \
+#      xf86-video-glint
+
 .endif # ${MACHINE} == "cats"
 
 .if ${MACHINE} == "dreamcast"
@@ -227,8 +230,6 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "mac68k"
 
-# needs porting for xorg-server 21.1.3
-#      xf86-video-glint
 .if ${MACHINE} == "macppc"
 SUBDIR+= \
        xf86-video-ati \
@@ -240,7 +241,11 @@
        xf86-video-r128 \
        xf86-video-tdfx \
        xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+#      xf86-video-glint
 #      xf86-video-imstt
+
 .endif # ${MACHINE} == "macppc"
 
 .if ${MACHINE} == "netwinder"
@@ -267,12 +272,14 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "ofppc"
 
-# needs porting for xorg-server 21.1.3
-#      xf86-video-s3
 .if ${MACHINE} == "prep"
 SUBDIR+= \
        xf86-video-cirrus \
        xf86-video-mga
+
+# needs porting for xorg-server 21.1.3
+#      xf86-video-s3
+
 .endif # ${MACHINE} == "prep"
 
 .if ${MACHINE} == "sgimips"
@@ -296,8 +303,6 @@
         xf86-video-wsfb
 .endif # ${MACHINE} == "shark"
 
-# needs porting for xorg-server 21.1.3
-#      xf86-video-glint
 .if ${MACHINE} == "sparc" || \
     ${MACHINE} == "sparc64"
 SUBDIR+= \
@@ -309,13 +314,11 @@
        xf86-video-suncg6 \
        xf86-video-sunffb \
        xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+#      xf86-video-glint
 #      xf86-video-ag10e \
-
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-       xf86-video-ag10e \
-       xf86-video-sunleo
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+#      xf86-video-sunleo
 
 .if ${MACHINE} == "sparc"
 SUBDIR+= \
@@ -323,11 +326,11 @@
        xf86-video-suncg14 \
        xf86-video-suntcx
 
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-       xf86-video-pnozz
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+# needs porting for xorg-server 21.1.3
+#      xf86-video-pnozz
+
 .endif # ${MACHINE} == "sparc"
+
 .endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 
 .if ${MACHINE} == "pmax" || \