Thu May 11 20:55:19 2017 UTC ()
Need new ati on dragonfly too.
old doesn't build and isn't interesting to fix


(maya)
diff -r1.39 -r1.40 pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile
cvs diff -r1.39 -r1.40 pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile (switch to unified diff)

--- pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile 2017/03/14 13:26:59 1.39
+++ pkgsrc/meta-pkgs/modular-xorg-drivers/Makefile 2017/05/11 20:55:19 1.40
@@ -1,95 +1,96 @@ @@ -1,95 +1,96 @@
1# $NetBSD: Makefile,v 1.39 2017/03/14 13:26:59 jperkin Exp $ 1# $NetBSD: Makefile,v 1.40 2017/05/11 20:55:19 maya Exp $
2 2
3DISTNAME= # empty 3DISTNAME= # empty
4PKGNAME= modular-xorg-drivers-1.19.0 4PKGNAME= modular-xorg-drivers-1.19.0
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= meta-pkgs x11 6CATEGORIES= meta-pkgs x11
7MASTER_SITES= ${MASTER_SITE_XORG:=driver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Modular Xorg driver meta-package 12COMMENT= Modular Xorg driver meta-package
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
15META_PACKAGE= yes 15META_PACKAGE= yes
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19DEPENDS+= xf86-input-acecad-[0-9]*:../../x11/xf86-input-acecad 19DEPENDS+= xf86-input-acecad-[0-9]*:../../x11/xf86-input-acecad
20DEPENDS+= xf86-input-keyboard-[0-9]*:../../x11/xf86-input-keyboard 20DEPENDS+= xf86-input-keyboard-[0-9]*:../../x11/xf86-input-keyboard
21DEPENDS+= xf86-input-mouse-[0-9]*:../../x11/xf86-input-mouse 21DEPENDS+= xf86-input-mouse-[0-9]*:../../x11/xf86-input-mouse
22DEPENDS+= xf86-input-penmount-[0-9]*:../../x11/xf86-input-penmount 22DEPENDS+= xf86-input-penmount-[0-9]*:../../x11/xf86-input-penmount
23.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 23.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
24DEPENDS+= xf86-input-vmmouse-[0-9]*:../../x11/xf86-input-vmmouse 24DEPENDS+= xf86-input-vmmouse-[0-9]*:../../x11/xf86-input-vmmouse
25.endif 25.endif
26.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 26.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
27DEPENDS+= xf86-input-ws-[0-9]*:../../x11/xf86-input-ws 27DEPENDS+= xf86-input-ws-[0-9]*:../../x11/xf86-input-ws
28.endif 28.endif
29DEPENDS+= xf86-input-void-[0-9]*:../../x11/xf86-input-void 29DEPENDS+= xf86-input-void-[0-9]*:../../x11/xf86-input-void
30DEPENDS+= xf86-video-amdgpu-[0-9]*:../../x11/xf86-video-amdgpu 30DEPENDS+= xf86-video-amdgpu-[0-9]*:../../x11/xf86-video-amdgpu
31DEPENDS+= xf86-video-apm-[0-9]*:../../x11/xf86-video-apm 31DEPENDS+= xf86-video-apm-[0-9]*:../../x11/xf86-video-apm
32DEPENDS+= xf86-video-ark-[0-9]*:../../x11/xf86-video-ark 32DEPENDS+= xf86-video-ark-[0-9]*:../../x11/xf86-video-ark
33DEPENDS+= xf86-video-ast-[0-9]*:../../x11/xf86-video-ast 33DEPENDS+= xf86-video-ast-[0-9]*:../../x11/xf86-video-ast
34.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-i386) || \ 34.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-i386) || \
35 !empty(MACHINE_PLATFORM:MNetBSD-7.*-x86_64) || \ 35 !empty(MACHINE_PLATFORM:MNetBSD-7.*-x86_64) || \
36 ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" 36 ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || \
 37 ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
37DEPENDS+= xf86-video-ati-[0-9]*:../../x11/xf86-video-ati 38DEPENDS+= xf86-video-ati-[0-9]*:../../x11/xf86-video-ati
38.else 39.else
39DEPENDS+= xf86-video-ati6-[0-9]*:../../x11/xf86-video-ati6 40DEPENDS+= xf86-video-ati6-[0-9]*:../../x11/xf86-video-ati6
40.endif 41.endif
41DEPENDS+= xf86-video-chips-[0-9]*:../../x11/xf86-video-chips 42DEPENDS+= xf86-video-chips-[0-9]*:../../x11/xf86-video-chips
42DEPENDS+= xf86-video-cirrus-[0-9]*:../../x11/xf86-video-cirrus 43DEPENDS+= xf86-video-cirrus-[0-9]*:../../x11/xf86-video-cirrus
43DEPENDS+= xf86-video-dummy-[0-9]*:../../x11/xf86-video-dummy 44DEPENDS+= xf86-video-dummy-[0-9]*:../../x11/xf86-video-dummy
44DEPENDS+= xf86-input-elographics-[0-9]*:../../x11/xf86-input-elographics 45DEPENDS+= xf86-input-elographics-[0-9]*:../../x11/xf86-input-elographics
45DEPENDS+= xf86-video-fbdev-[0-9]*:../../x11/xf86-video-fbdev 46DEPENDS+= xf86-video-fbdev-[0-9]*:../../x11/xf86-video-fbdev
46DEPENDS+= xf86-input-fpit-[0-9]*:../../x11/xf86-input-fpit 47DEPENDS+= xf86-input-fpit-[0-9]*:../../x11/xf86-input-fpit
47DEPENDS+= xf86-video-glint-[0-9]*:../../x11/xf86-video-glint 48DEPENDS+= xf86-video-glint-[0-9]*:../../x11/xf86-video-glint
48DEPENDS+= xf86-input-hyperpen-[0-9]*:../../x11/xf86-input-hyperpen 49DEPENDS+= xf86-input-hyperpen-[0-9]*:../../x11/xf86-input-hyperpen
49DEPENDS+= xf86-video-i128-[0-9]*:../../x11/xf86-video-i128 50DEPENDS+= xf86-video-i128-[0-9]*:../../x11/xf86-video-i128
50DEPENDS+= xf86-video-i740-[0-9]*:../../x11/xf86-video-i740 51DEPENDS+= xf86-video-i740-[0-9]*:../../x11/xf86-video-i740
51DEPENDS+= xf86-video-intel-[0-9]*:../../x11/xf86-video-intel 52DEPENDS+= xf86-video-intel-[0-9]*:../../x11/xf86-video-intel
52.if ${OPSYS} != "SunOS" 53.if ${OPSYS} != "SunOS"
53DEPENDS+= xf86-input-joystick-[0-9]*:../../x11/xf86-input-joystick 54DEPENDS+= xf86-input-joystick-[0-9]*:../../x11/xf86-input-joystick
54.endif 55.endif
55DEPENDS+= xf86-video-mach64-[0-9]*:../../x11/xf86-video-mach64 56DEPENDS+= xf86-video-mach64-[0-9]*:../../x11/xf86-video-mach64
56DEPENDS+= xf86-video-mga-[0-9]*:../../x11/xf86-video-mga 57DEPENDS+= xf86-video-mga-[0-9]*:../../x11/xf86-video-mga
57DEPENDS+= xf86-input-mutouch-[0-9]*:../../x11/xf86-input-mutouch 58DEPENDS+= xf86-input-mutouch-[0-9]*:../../x11/xf86-input-mutouch
58# does not work with 1.17 server 59# does not work with 1.17 server
59.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS]) 60.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
60DEPENDS+= xf86-video-modesetting-[0-9]*:../../x11/xf86-video-modesetting 61DEPENDS+= xf86-video-modesetting-[0-9]*:../../x11/xf86-video-modesetting
61DEPENDS+= xf86-video-newport-[0-9]*:../../x11/xf86-video-newport 62DEPENDS+= xf86-video-newport-[0-9]*:../../x11/xf86-video-newport
62.endif 63.endif
63DEPENDS+= xf86-video-neomagic-[0-9]*:../../x11/xf86-video-neomagic 64DEPENDS+= xf86-video-neomagic-[0-9]*:../../x11/xf86-video-neomagic
64DEPENDS+= xf86-video-nouveau-[0-9]*:../../x11/xf86-video-nouveau 65DEPENDS+= xf86-video-nouveau-[0-9]*:../../x11/xf86-video-nouveau
65DEPENDS+= xf86-video-nv-[0-9]*:../../x11/xf86-video-nv 66DEPENDS+= xf86-video-nv-[0-9]*:../../x11/xf86-video-nv
66DEPENDS+= xf86-video-openchrome-[0-9]*:../../x11/xf86-video-openchrome 67DEPENDS+= xf86-video-openchrome-[0-9]*:../../x11/xf86-video-openchrome
67DEPENDS+= xf86-video-qxl-[0-9]*:../../x11/xf86-video-qxl 68DEPENDS+= xf86-video-qxl-[0-9]*:../../x11/xf86-video-qxl
68DEPENDS+= xf86-video-r128-[0-9]*:../../x11/xf86-video-r128 69DEPENDS+= xf86-video-r128-[0-9]*:../../x11/xf86-video-r128
69DEPENDS+= xf86-video-rendition-[0-9]*:../../x11/xf86-video-rendition 70DEPENDS+= xf86-video-rendition-[0-9]*:../../x11/xf86-video-rendition
70DEPENDS+= xf86-video-s3-[0-9]*:../../x11/xf86-video-s3 71DEPENDS+= xf86-video-s3-[0-9]*:../../x11/xf86-video-s3
71DEPENDS+= xf86-video-s3virge-[0-9]*:../../x11/xf86-video-s3virge 72DEPENDS+= xf86-video-s3virge-[0-9]*:../../x11/xf86-video-s3virge
72DEPENDS+= xf86-video-savage-[0-9]*:../../x11/xf86-video-savage 73DEPENDS+= xf86-video-savage-[0-9]*:../../x11/xf86-video-savage
73DEPENDS+= xf86-video-siliconmotion-[0-9]*:../../x11/xf86-video-siliconmotion 74DEPENDS+= xf86-video-siliconmotion-[0-9]*:../../x11/xf86-video-siliconmotion
74DEPENDS+= xf86-video-sis-[0-9]*:../../x11/xf86-video-sis 75DEPENDS+= xf86-video-sis-[0-9]*:../../x11/xf86-video-sis
75DEPENDS+= xf86-video-suncg14-[0-9]*:../../x11/xf86-video-suncg14 76DEPENDS+= xf86-video-suncg14-[0-9]*:../../x11/xf86-video-suncg14
76DEPENDS+= xf86-video-suncg3-[0-9]*:../../x11/xf86-video-suncg3 77DEPENDS+= xf86-video-suncg3-[0-9]*:../../x11/xf86-video-suncg3
77DEPENDS+= xf86-video-suncg6-[0-9]*:../../x11/xf86-video-suncg6 78DEPENDS+= xf86-video-suncg6-[0-9]*:../../x11/xf86-video-suncg6
78DEPENDS+= xf86-video-sunffb-[0-9]*:../../x11/xf86-video-sunffb 79DEPENDS+= xf86-video-sunffb-[0-9]*:../../x11/xf86-video-sunffb
79DEPENDS+= xf86-video-sunleo-[0-9]*:../../x11/xf86-video-sunleo 80DEPENDS+= xf86-video-sunleo-[0-9]*:../../x11/xf86-video-sunleo
80DEPENDS+= xf86-video-suntcx-[0-9]*:../../x11/xf86-video-suntcx 81DEPENDS+= xf86-video-suntcx-[0-9]*:../../x11/xf86-video-suntcx
81DEPENDS+= xf86-video-tdfx-[0-9]*:../../x11/xf86-video-tdfx 82DEPENDS+= xf86-video-tdfx-[0-9]*:../../x11/xf86-video-tdfx
82DEPENDS+= xf86-video-tga-[0-9]*:../../x11/xf86-video-tga 83DEPENDS+= xf86-video-tga-[0-9]*:../../x11/xf86-video-tga
83DEPENDS+= xf86-video-trident-[0-9]*:../../x11/xf86-video-trident 84DEPENDS+= xf86-video-trident-[0-9]*:../../x11/xf86-video-trident
84DEPENDS+= xf86-video-tseng-[0-9]*:../../x11/xf86-video-tseng 85DEPENDS+= xf86-video-tseng-[0-9]*:../../x11/xf86-video-tseng
85DEPENDS+= xf86-video-vesa-[0-9]*:../../x11/xf86-video-vesa 86DEPENDS+= xf86-video-vesa-[0-9]*:../../x11/xf86-video-vesa
86.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 87.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
87DEPENDS+= xf86-video-vmware-[0-9]*:../../x11/xf86-video-vmware 88DEPENDS+= xf86-video-vmware-[0-9]*:../../x11/xf86-video-vmware
88DEPENDS+= xf86-video-voodoo-[0-9]*:../../x11/xf86-video-voodoo 89DEPENDS+= xf86-video-voodoo-[0-9]*:../../x11/xf86-video-voodoo
89.endif 90.endif
90.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 91.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
91DEPENDS+= xf86-video-wsfb-[0-9]*:../../x11/xf86-video-wsfb 92DEPENDS+= xf86-video-wsfb-[0-9]*:../../x11/xf86-video-wsfb
92.endif 93.endif
93DEPENDS+= xf86-video-xgi-[0-9]*:../../x11/xf86-video-xgi 94DEPENDS+= xf86-video-xgi-[0-9]*:../../x11/xf86-video-xgi
94 95
95.include "../../mk/bsd.pkg.mk" 96.include "../../mk/bsd.pkg.mk"