CVS commit: pkgsrc/meta-pkgs/modular-xorg-drivers

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 31 08:58:37 UTC 2021

Modified Files:
        pkgsrc/meta-pkgs/modular-xorg-drivers: Makefile

Log Message:
modular-xorg-drivers: Compile most video drivers conditionally based
on the target platform, using NetBSD's lists as a reference.

PR pkg/56480


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile
diff -u pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile:1.44 pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile:1.45
--- pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile:1.44 Fri Jul  2 17:04:09 2021
+++ pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile      Sun Oct 31 08:58:37 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2021/07/02 17:04:09 nia Exp $
+# $NetBSD: Makefile,v 1.45 2021/10/31 08:58:37 nia Exp $
 
 DISTNAME=      # empty
 PKGNAME=       modular-xorg-drivers-1.19.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    meta-pkgs x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 DISTFILES=     # empty
@@ -26,69 +26,111 @@ DEPENDS+=  xf86-input-vmmouse-[0-9]*:../.
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
 DEPENDS+=      xf86-input-ws-[0-9]*:../../x11/xf86-input-ws
 .endif
+DEPENDS+=      xf86-input-elographics-[0-9]*:../../x11/xf86-input-elographics
+DEPENDS+=      xf86-input-fpit-[0-9]*:../../x11/xf86-input-fpit
+DEPENDS+=      xf86-input-hyperpen-[0-9]*:../../x11/xf86-input-hyperpen
+.if ${OPSYS} != "SunOS"
+DEPENDS+=      xf86-input-joystick-[0-9]*:../../x11/xf86-input-joystick
+.endif
+DEPENDS+=      xf86-input-mutouch-[0-9]*:../../x11/xf86-input-mutouch
 DEPENDS+=      xf86-input-void-[0-9]*:../../x11/xf86-input-void
+
+DEPENDS+=      xf86-video-dummy-[0-9]*:../../x11/xf86-video-dummy
+
+.if ${OPSYS} == "Linux"
+DEPENDS+=      xf86-video-fbdev-[0-9]*:../../x11/xf86-video-fbdev
+.endif
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+DEPENDS+=      xf86-video-wsfb-[0-9]*:../../x11/xf86-video-wsfb
+.endif
+
+# This list approximates matches NetBSD's
+# src/external/mit/xorg/server/drivers/Makefile
+
+.if !empty(MACHINE_ARCH:Mearm*) || !empty(MACHINE_ARCH:Maarch64*)
+DEPENDS+=      xf86-video-ati-[0-9]*:../../x11/xf86-video-ati
+DEPENDS+=      xf86-video-nouveau-[0-9]*:../../x11/xf86-video-nouveau
+.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 DEPENDS+=      xf86-video-amdgpu-[0-9]*:../../x11/xf86-video-amdgpu
-DEPENDS+=      xf86-video-apm-[0-9]*:../../x11/xf86-video-apm
-DEPENDS+=      xf86-video-ark-[0-9]*:../../x11/xf86-video-ark
 DEPENDS+=      xf86-video-ast-[0-9]*:../../x11/xf86-video-ast
-.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||   \
-    !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \
-    ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" ||    \
-    ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
 DEPENDS+=      xf86-video-ati-[0-9]*:../../x11/xf86-video-ati
-.else
-DEPENDS+=      xf86-video-ati6-[0-9]*:../../x11/xf86-video-ati6
-.endif
 DEPENDS+=      xf86-video-chips-[0-9]*:../../x11/xf86-video-chips
 DEPENDS+=      xf86-video-cirrus-[0-9]*:../../x11/xf86-video-cirrus
-DEPENDS+=      xf86-video-dummy-[0-9]*:../../x11/xf86-video-dummy
-DEPENDS+=      xf86-input-elographics-[0-9]*:../../x11/xf86-input-elographics
-DEPENDS+=      xf86-video-fbdev-[0-9]*:../../x11/xf86-video-fbdev
-DEPENDS+=      xf86-input-fpit-[0-9]*:../../x11/xf86-input-fpit
-DEPENDS+=      xf86-video-glint-[0-9]*:../../x11/xf86-video-glint
-DEPENDS+=      xf86-input-hyperpen-[0-9]*:../../x11/xf86-input-hyperpen
 DEPENDS+=      xf86-video-i128-[0-9]*:../../x11/xf86-video-i128
 DEPENDS+=      xf86-video-i740-[0-9]*:../../x11/xf86-video-i740
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 DEPENDS+=      xf86-video-intel-[0-9]*:../../x11/xf86-video-intel
-.endif
-.if ${OPSYS} != "SunOS"
-DEPENDS+=      xf86-input-joystick-[0-9]*:../../x11/xf86-input-joystick
-.endif
 DEPENDS+=      xf86-video-mach64-[0-9]*:../../x11/xf86-video-mach64
 DEPENDS+=      xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
-DEPENDS+=      xf86-input-mutouch-[0-9]*:../../x11/xf86-input-mutouch
 DEPENDS+=      xf86-video-neomagic-[0-9]*:../../x11/xf86-video-neomagic
-DEPENDS+=      xf86-video-nouveau-[0-9]*:../../x11/xf86-video-nouveau
 DEPENDS+=      xf86-video-nv-[0-9]*:../../x11/xf86-video-nv
+DEPENDS+=      xf86-video-nouveau-[0-9]*:../../x11/xf86-video-nouveau
 DEPENDS+=      xf86-video-openchrome-[0-9]*:../../x11/xf86-video-openchrome
 DEPENDS+=      xf86-video-qxl-[0-9]*:../../x11/xf86-video-qxl
-DEPENDS+=      xf86-video-r128-[0-9]*:../../x11/xf86-video-r128
-DEPENDS+=      xf86-video-rendition-[0-9]*:../../x11/xf86-video-rendition
 DEPENDS+=      xf86-video-s3-[0-9]*:../../x11/xf86-video-s3
 DEPENDS+=      xf86-video-s3virge-[0-9]*:../../x11/xf86-video-s3virge
 DEPENDS+=      xf86-video-savage-[0-9]*:../../x11/xf86-video-savage
 DEPENDS+=      xf86-video-siliconmotion-[0-9]*:../../x11/xf86-video-siliconmotion
 DEPENDS+=      xf86-video-sis-[0-9]*:../../x11/xf86-video-sis
-DEPENDS+=      xf86-video-suncg14-[0-9]*:../../x11/xf86-video-suncg14
-DEPENDS+=      xf86-video-suncg3-[0-9]*:../../x11/xf86-video-suncg3
-DEPENDS+=      xf86-video-suncg6-[0-9]*:../../x11/xf86-video-suncg6
-DEPENDS+=      xf86-video-sunffb-[0-9]*:../../x11/xf86-video-sunffb
-DEPENDS+=      xf86-video-sunleo-[0-9]*:../../x11/xf86-video-sunleo
-DEPENDS+=      xf86-video-suntcx-[0-9]*:../../x11/xf86-video-suntcx
 DEPENDS+=      xf86-video-tdfx-[0-9]*:../../x11/xf86-video-tdfx
 DEPENDS+=      xf86-video-tga-[0-9]*:../../x11/xf86-video-tga
 DEPENDS+=      xf86-video-trident-[0-9]*:../../x11/xf86-video-trident
 DEPENDS+=      xf86-video-tseng-[0-9]*:../../x11/xf86-video-tseng
-DEPENDS+=      xf86-video-vesa-[0-9]*:../../x11/xf86-video-vesa
 DEPENDS+=      xf86-video-vboxvideo-[0-9]*:../../x11/xf86-video-vboxvideo
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+DEPENDS+=      xf86-video-vesa-[0-9]*:../../x11/xf86-video-vesa
 DEPENDS+=      xf86-video-vmware-[0-9]*:../../x11/xf86-video-vmware
 DEPENDS+=      xf86-video-voodoo-[0-9]*:../../x11/xf86-video-voodoo
+.elif ${MACHINE_ARCH} == "alpha"
+DEPENDS+=      xf86-video-ast-[0-9]*:../../x11/xf86-video-ast
+DEPENDS+=      xf86-video-ati-[0-9]*:../../x11/xf86-video-ati
+DEPENDS+=      xf86-video-chips-[0-9]*:../../x11/xf86-video-chips
+DEPENDS+=      xf86-video-cirrus-[0-9]*:../../x11/xf86-video-cirrus
+DEPENDS+=      xf86-video-i128-[0-9]*:../../x11/xf86-video-i128
+DEPENDS+=      xf86-video-i740-[0-9]*:../../x11/xf86-video-i740
+DEPENDS+=      xf86-video-mach64-[0-9]*:../../x11/xf86-video-mach64
+DEPENDS+=      xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
+DEPENDS+=      xf86-video-nv-[0-9]*:../../x11/xf86-video-nv
+DEPENDS+=      xf86-video-r128-[0-9]*:../../x11/xf86-video-r128
+DEPENDS+=      xf86-video-s3-[0-9]*:../../x11/xf86-video-s3
+DEPENDS+=      xf86-video-s3virge-[0-9]*:../../x11/xf86-video-s3virge
+DEPENDS+=      xf86-video-savage-[0-9]*:../../x11/xf86-video-savage
+DEPENDS+=      xf86-video-siliconmotion-[0-9]*:../../x11/xf86-video-siliconmotion
+DEPENDS+=      xf86-video-sis-[0-9]*:../../x11/xf86-video-sis
+DEPENDS+=      xf86-video-tdfx-[0-9]*:../../x11/xf86-video-tdfx
+DEPENDS+=      xf86-video-tga-[0-9]*:../../x11/xf86-video-tga
+DEPENDS+=      xf86-video-trident-[0-9]*:../../x11/xf86-video-trident
+DEPENDS+=      xf86-video-tseng-[0-9]*:../../x11/xf86-video-tseng
+.elif ${MACHINE_ARCH} == "hppa"
+DEPENDS+=      xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
+DEPENDS+=      xf86-video-r128-[0-9]*:../../x11/xf86-video-r128
+.elif !empty(MACHINE_ARCH:Mmips*)
+DEPENDS+=      xf86-video-cirrus-[0-9]*:../../x11/xf86-video-cirrus
+DEPENDS+=      xf86-video-glint-[0-9]*:../../x11/xf86-video-glint
+DEPENDS+=      xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
+DEPENDS+=      xf86-video-siliconmotion-[0-9]*:../../x11/xf86-video-siliconmotion
+DEPENDS+=      xf86-video-sis-[0-9]*:../../x11/xf86-video-sis
+DEPENDS+=      xf86-video-s3-[0-9]*:../../x11/xf86-video-s3
+.elif ${MACHINE_ARCH} == "powerpc"
+DEPENDS+=      xf86-video-ati-[0-9]*:../../x11/xf86-video-ati
+DEPENDS+=      xf86-video-chips-[0-9]*:../../x11/xf86-video-chips
+DEPENDS+=      xf86-video-glint-[0-9]*:../../x11/xf86-video-glint
+DEPENDS+=      xf86-video-mach64-[0-9]*:../../x11/xf86-video-mach64
+DEPENDS+=      xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
+DEPENDS+=      xf86-video-nv-[0-9]*:../../x11/xf86-video-nv
+DEPENDS+=      xf86-video-r128-[0-9]*:../../x11/xf86-video-r128
+DEPENDS+=      xf86-video-tdfx-[0-9]*:../../x11/xf86-video-tdfx
+.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+DEPENDS+=      xf86-video-ati-[0-9]*:../../x11/xf86-video-ati
+DEPENDS+=      xf86-video-glint-[0-9]*:../../x11/xf86-video-glint
+DEPENDS+=      xf86-video-mach64-[0-9]*:../../x11/xf86-video-mach64
+DEPENDS+=      xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
+DEPENDS+=      xf86-video-r128-[0-9]*:../../x11/xf86-video-r128
+DEPENDS+=      xf86-video-suncg6-[0-9]*:../../x11/xf86-video-suncg6
+DEPENDS+=      xf86-video-sunffb-[0-9]*:../../x11/xf86-video-sunffb
+.  if ${MACHINE_ARCH} == "sparc"
+DEPENDS+=      xf86-video-suncg14-[0-9]*:../../x11/xf86-video-suncg14
+DEPENDS+=      xf86-video-suntcx-[0-9]*:../../x11/xf86-video-suntcx
+.  endif
 .endif
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-DEPENDS+=      xf86-video-wsfb-[0-9]*:../../x11/xf86-video-wsfb
-.endif
-DEPENDS+=      xf86-video-xgi-[0-9]*:../../x11/xf86-video-xgi
 
 .include "../../mk/bsd.pkg.mk"