Fri Nov 6 21:32:23 2015 UTC ()
remove redundant \


(szptvlfn)
diff -r1.32 -r1.33 src/external/mit/xorg/lib/pixman/Makefile
diff -r1.74 -r1.75 src/external/mit/xorg/server/drivers/Makefile
diff -r1.1 -r1.2 src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile
diff -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/composite/Makefile
diff -r1.1 -r1.2 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs diff -r1.32 -r1.33 src/external/mit/xorg/lib/pixman/Makefile (switch to unified diff)

--- src/external/mit/xorg/lib/pixman/Makefile 2015/05/02 14:54:18 1.32
+++ src/external/mit/xorg/lib/pixman/Makefile 2015/11/06 21:32:22 1.33
@@ -1,119 +1,119 @@ @@ -1,119 +1,119 @@
1# $NetBSD: Makefile,v 1.32 2015/05/02 14:54:18 macallan Exp $ 1# $NetBSD: Makefile,v 1.33 2015/11/06 21:32:22 szptvlfn Exp $
2 2
3NOLINT= 1 # defined 3NOLINT= 1 # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7LIB= pixman-1 7LIB= pixman-1
8 8
9DIST= ${X11SRCDIR.pixman}/pixman 9DIST= ${X11SRCDIR.pixman}/pixman
10.PATH: ${DIST} 10.PATH: ${DIST}
11 11
12SRCS= \ 12SRCS= \
13 pixman.c \ 13 pixman.c \
14 pixman-access.c \ 14 pixman-access.c \
15 pixman-access-accessors.c \ 15 pixman-access-accessors.c \
16 pixman-bits-image.c \ 16 pixman-bits-image.c \
17 pixman-combine32.c \ 17 pixman-combine32.c \
18 pixman-combine-float.c \ 18 pixman-combine-float.c \
19 pixman-conical-gradient.c \ 19 pixman-conical-gradient.c \
20 pixman-edge.c \ 20 pixman-edge.c \
21 pixman-edge-accessors.c \ 21 pixman-edge-accessors.c \
22 pixman-fast-path.c \ 22 pixman-fast-path.c \
23 pixman-filter.c \ 23 pixman-filter.c \
24 pixman-glyph.c \ 24 pixman-glyph.c \
25 pixman-general.c \ 25 pixman-general.c \
26 pixman-gradient-walker.c \ 26 pixman-gradient-walker.c \
27 pixman-image.c \ 27 pixman-image.c \
28 pixman-implementation.c \ 28 pixman-implementation.c \
29 pixman-linear-gradient.c \ 29 pixman-linear-gradient.c \
30 pixman-matrix.c \ 30 pixman-matrix.c \
31 pixman-noop.c \ 31 pixman-noop.c \
32 pixman-radial-gradient.c \ 32 pixman-radial-gradient.c \
33 pixman-region16.c \ 33 pixman-region16.c \
34 pixman-region32.c \ 34 pixman-region32.c \
35 pixman-solid-fill.c \ 35 pixman-solid-fill.c \
36 pixman-timer.c \ 36 pixman-timer.c \
37 pixman-trap.c \ 37 pixman-trap.c \
38 pixman-utils.c 38 pixman-utils.c
39 39
40SRCS+= \ 40SRCS+= \
41 pixman-x86.c \ 41 pixman-x86.c \
42 pixman-mips.c \ 42 pixman-mips.c \
43 pixman-arm.c \ 43 pixman-arm.c \
44 pixman-ppc.c \ 44 pixman-ppc.c
45 45
46# XXX 46# XXX
47 47
48# missing: HAVE_GCC_VECTOR_EXTENSIONS 48# missing: HAVE_GCC_VECTOR_EXTENSIONS
49 49
50.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 50.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
51. if ${MACHINE_ARCH} == "i386" 51. if ${MACHINE_ARCH} == "i386"
52SRCS+= pixman-mmx.c 52SRCS+= pixman-mmx.c
53COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden 53COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
54. if defined(HAVE_LLVM) 54. if defined(HAVE_LLVM)
55COPTS.pixman-mmx.c+= -Wno-error=attributes 55COPTS.pixman-mmx.c+= -Wno-error=attributes
56. endif 56. endif
57CPPFLAGS+= -DUSE_X86_MMX 57CPPFLAGS+= -DUSE_X86_MMX
58MKDEPFLAGS+= -mmmx 58MKDEPFLAGS+= -mmmx
59. endif 59. endif
60SRCS+= pixman-sse2.c pixman-ssse3.c 60SRCS+= pixman-sse2.c pixman-ssse3.c
61COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden 61COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
62COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden 62COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden
63CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3 63CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3
64MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden 64MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden
65.endif 65.endif
66 66
67.if ${MACHINE_ARCH} == "powerpc" 67.if ${MACHINE_ARCH} == "powerpc"
68SRCS+= pixman-vmx.c 68SRCS+= pixman-vmx.c
69COPTS.pixman-vmx.c= -maltivec 69COPTS.pixman-vmx.c= -maltivec
70CPPFLAGS+= -DUSE_VMX 70CPPFLAGS+= -DUSE_VMX
71MKDEPFLAGS+= -maltivec 71MKDEPFLAGS+= -maltivec
72.endif 72.endif
73 73
74.if !empty(MACHINE_ARCH:Mearm*) 74.if !empty(MACHINE_ARCH:Mearm*)
75# ARM SIMD 75# ARM SIMD
76SRCS+= pixman-arm-simd.c \ 76SRCS+= pixman-arm-simd.c \
77 pixman-arm-simd-asm.S \ 77 pixman-arm-simd-asm.S \
78 pixman-arm-simd-asm-scaled.S 78 pixman-arm-simd-asm-scaled.S
79CPPFLAGS+= -DUSE_ARM_SIMD 79CPPFLAGS+= -DUSE_ARM_SIMD
80# ARM NEON 80# ARM NEON
81SRCS+= pixman-arm-neon.c \ 81SRCS+= pixman-arm-neon.c \
82 pixman-arm-neon-asm.S \ 82 pixman-arm-neon-asm.S \
83 pixman-arm-neon-asm-bilinear.S 83 pixman-arm-neon-asm-bilinear.S
84CPPFLAGS+= -DUSE_ARM_NEON 84CPPFLAGS+= -DUSE_ARM_NEON
85 85
86AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :} 86AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
87# ARM iwMMX 87# ARM iwMMX
88#SRCS+= pixman-mmx.c 88#SRCS+= pixman-mmx.c
89#COPTS.pixman-mmx.c= -mcpu=iwmmxt 89#COPTS.pixman-mmx.c= -mcpu=iwmmxt
90#CPPFLAGS+= -DUSE_ARM_IWMMXT 90#CPPFLAGS+= -DUSE_ARM_IWMMXT
91.endif 91.endif
92 92
93.if ${MACHINE_ARCH} == "mips64el" 93.if ${MACHINE_ARCH} == "mips64el"
94# Loongson MMI 94# Loongson MMI
95SRCS+= pixman-mmx.c 95SRCS+= pixman-mmx.c
96CPPFLAGS+= -DUSE_LOONGSON_MMI 96CPPFLAGS+= -DUSE_LOONGSON_MMI
97# SIMD instructions use floatpoint registers so we need to enable their use 97# SIMD instructions use floatpoint registers so we need to enable their use
98COPTS.pixman-mmx.c= -march=loongson2f -mhard-float 98COPTS.pixman-mmx.c= -march=loongson2f -mhard-float
99.endif 99.endif
100 100
101INCS= pixman.h pixman-version.h 101INCS= pixman.h pixman-version.h
102INCSDIR=${X11INCDIR}/pixman-1 102INCSDIR=${X11INCDIR}/pixman-1
103 103
104CPPFLAGS+= -DHAVE_CONFIG_H \ 104CPPFLAGS+= -DHAVE_CONFIG_H \
105 -I${X11SRCDIR.pixman}/../include \ 105 -I${X11SRCDIR.pixman}/../include \
106 -I${X11SRCDIR.pixman}/../combine \ 106 -I${X11SRCDIR.pixman}/../combine \
107 -I${X11SRCDIR.pixman}/pixman 107 -I${X11SRCDIR.pixman}/pixman
108 108
109# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS 109# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS
110CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC 110CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC
111#CPPFLAGS+= -DTLS=__thread 111#CPPFLAGS+= -DTLS=__thread
112 112
113LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm 113LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
114 114
115PKGCONFIG= pixman-1 115PKGCONFIG= pixman-1
116PKGDIST= pixman 116PKGDIST= pixman
117 117
118.include <bsd.x11.mk> 118.include <bsd.x11.mk>
119.include <bsd.lib.mk> 119.include <bsd.lib.mk>
cvs diff -r1.74 -r1.75 src/external/mit/xorg/server/drivers/Makefile (switch to unified diff)

--- src/external/mit/xorg/server/drivers/Makefile 2015/11/06 01:17:08 1.74
+++ src/external/mit/xorg/server/drivers/Makefile 2015/11/06 21:32:22 1.75
@@ -1,298 +1,298 @@ @@ -1,298 +1,298 @@
1# $NetBSD: Makefile,v 1.74 2015/11/06 01:17:08 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.75 2015/11/06 21:32:22 szptvlfn Exp $
2 2
3# xf86-input drivers 3# xf86-input drivers
4 4
5SUBDIR= \ 5SUBDIR= \
6 xf86-input-keyboard \ 6 xf86-input-keyboard \
7 xf86-input-mouse \ 7 xf86-input-mouse \
8 xf86-input-ws 8 xf86-input-ws
9 9
10.if ${MACHINE_ARCH} == "i386" || \ 10.if ${MACHINE_ARCH} == "i386" || \
11 ${MACHINE_ARCH} == "x86_64" 11 ${MACHINE_ARCH} == "x86_64"
12SUBDIR+= \ 12SUBDIR+= \
13 xf86-input-vmmouse 13 xf86-input-vmmouse
14 14
15.if ${MACHINE_ARCH} == "i386" 15.if ${MACHINE_ARCH} == "i386"
16SUBDIR+= \ 16SUBDIR+= \
17 xf86-input-elographics 17 xf86-input-elographics
18.endif 18.endif
19 19
20.endif 20.endif
21 21
22# xf86-video drivers 22# xf86-video drivers
23 23
24.include <bsd.own.mk> 24.include <bsd.own.mk>
25 25
26.if ${MACHINE_ARCH} == "i386" || \ 26.if ${MACHINE_ARCH} == "i386" || \
27 ${MACHINE_ARCH} == "x86_64" 27 ${MACHINE_ARCH} == "x86_64"
28SUBDIR+= \ 28SUBDIR+= \
29 xf86-video-apm \ 29 xf86-video-apm \
30 xf86-video-ark \ 30 xf86-video-ark \
31 xf86-video-ast \ 31 xf86-video-ast \
32 xf86-video-ati \ 32 xf86-video-ati \
33 xf86-video-chips \ 33 xf86-video-chips \
34 xf86-video-cirrus \ 34 xf86-video-cirrus \
35 xf86-video-cirrus_alpine \ 35 xf86-video-cirrus_alpine \
36 xf86-video-cirrus_laguna \ 36 xf86-video-cirrus_laguna \
37 xf86-video-glint \ 37 xf86-video-glint \
38 xf86-video-i128 \ 38 xf86-video-i128 \
39 xf86-video-i740 \ 39 xf86-video-i740
40 40
41# needs porting for xorg-server 1.6 41# needs porting for xorg-server 1.6
42# xf86-video-imstt \ 42# xf86-video-imstt \
43 43
44SUBDIR+= \ 44SUBDIR+= \
45 xf86-video-intel \ 45 xf86-video-intel \
46 xf86-video-intel-old \ 46 xf86-video-intel-old \
47 xf86-video-mach64 \ 47 xf86-video-mach64 \
48 xf86-video-mga \ 48 xf86-video-mga \
49 xf86-video-neomagic \ 49 xf86-video-neomagic \
50 xf86-video-nv \ 50 xf86-video-nv \
51 xf86-video-nouveau \ 51 xf86-video-nouveau \
52 xf86-video-openchrome \ 52 xf86-video-openchrome \
53 xf86-video-r128 \ 53 xf86-video-r128 \
54 xf86-video-radeon \ 54 xf86-video-radeon \
55 xf86-video-radeon-kms \ 55 xf86-video-radeon-kms \
56 xf86-video-s3 \ 56 xf86-video-s3 \
57 xf86-video-s3virge \ 57 xf86-video-s3virge \
58 xf86-video-savage \ 58 xf86-video-savage \
59 xf86-video-siliconmotion \ 59 xf86-video-siliconmotion \
60 xf86-video-sis \ 60 xf86-video-sis \
61 xf86-video-tdfx \ 61 xf86-video-tdfx \
62 xf86-video-tga \ 62 xf86-video-tga \
63 xf86-video-trident \ 63 xf86-video-trident \
64 xf86-video-tseng \ 64 xf86-video-tseng \
65 xf86-video-vmware \ 65 xf86-video-vmware \
66 xf86-video-vesa \ 66 xf86-video-vesa \
67 xf86-video-wsfb \ 67 xf86-video-wsfb \
68 xf86-video-xgi 68 xf86-video-xgi
69# xf86-video-rendition 69# xf86-video-rendition
70 70
71.if ${MACHINE_ARCH} == "i386" 71.if ${MACHINE_ARCH} == "i386"
72SUBDIR+= \ 72SUBDIR+= \
73 xf86-video-geode 73 xf86-video-geode
74.endif # ${MACHINE_ARCH} == "i386" 74.endif # ${MACHINE_ARCH} == "i386"
75 75
76.endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 76.endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
77 77
78.if ${MACHINE} == "alpha" 78.if ${MACHINE} == "alpha"
79SUBDIR+= \ 79SUBDIR+= \
80 xf86-video-apm \ 80 xf86-video-apm \
81 xf86-video-ark \ 81 xf86-video-ark \
82 xf86-video-ast \ 82 xf86-video-ast \
83 xf86-video-ati \ 83 xf86-video-ati \
84 xf86-video-chips \ 84 xf86-video-chips \
85 xf86-video-cirrus \ 85 xf86-video-cirrus \
86 xf86-video-cirrus_alpine \ 86 xf86-video-cirrus_alpine \
87 xf86-video-cirrus_laguna \ 87 xf86-video-cirrus_laguna \
88 xf86-video-glint \ 88 xf86-video-glint \
89 xf86-video-i128 \ 89 xf86-video-i128 \
90 xf86-video-i740 \ 90 xf86-video-i740 \
91 xf86-video-mach64 \ 91 xf86-video-mach64 \
92 xf86-video-mga \ 92 xf86-video-mga \
93 xf86-video-nv \ 93 xf86-video-nv \
94 xf86-video-r128 \ 94 xf86-video-r128 \
95 xf86-video-radeon \ 95 xf86-video-radeon \
96 xf86-video-s3 \ 96 xf86-video-s3 \
97 xf86-video-s3virge \ 97 xf86-video-s3virge \
98 xf86-video-savage \ 98 xf86-video-savage \
99 xf86-video-siliconmotion \ 99 xf86-video-siliconmotion \
100 xf86-video-sis \ 100 xf86-video-sis \
101 xf86-video-tdfx \ 101 xf86-video-tdfx \
102 xf86-video-tga \ 102 xf86-video-tga \
103 xf86-video-trident \ 103 xf86-video-trident \
104 xf86-video-tseng \ 104 xf86-video-tseng \
105 xf86-video-wsfb 105 xf86-video-wsfb
106# xf86-video-imstt 106# xf86-video-imstt
107.endif # ${MACHINE} == "alpha" 107.endif # ${MACHINE} == "alpha"
108 108
109.if ${MACHINE} == "amiga" 109.if ${MACHINE} == "amiga"
110SUBDIR+= \ 110SUBDIR+= \
111 xf86-video-wsfb 111 xf86-video-wsfb
112.endif # ${MACHINE} == "amiga" 112.endif # ${MACHINE} == "amiga"
113 113
114.if ${MACHINE} == "bebox" 114.if ${MACHINE} == "bebox"
115SUBDIR+= \ 115SUBDIR+= \
116 xf86-video-cirrus \ 116 xf86-video-cirrus \
117 xf86-video-cirrus_alpine \ 117 xf86-video-cirrus_alpine \
118 xf86-video-mga \ 118 xf86-video-mga \
119 xf86-video-s3 \ 119 xf86-video-s3 \
120 xf86-video-s3virge 120 xf86-video-s3virge
121.endif # ${MACHINE} == "bebox" 121.endif # ${MACHINE} == "bebox"
122 122
123.if ${MACHINE} == "cats" 123.if ${MACHINE} == "cats"
124SUBDIR+= \ 124SUBDIR+= \
125 xf86-video-apm \ 125 xf86-video-apm \
126 xf86-video-ark \ 126 xf86-video-ark \
127 xf86-video-ast \ 127 xf86-video-ast \
128 xf86-video-ati \ 128 xf86-video-ati \
129 xf86-video-chips \ 129 xf86-video-chips \
130 xf86-video-cirrus \ 130 xf86-video-cirrus \
131 xf86-video-cirrus_alpine \ 131 xf86-video-cirrus_alpine \
132 xf86-video-cirrus_laguna \ 132 xf86-video-cirrus_laguna \
133 xf86-video-glint \ 133 xf86-video-glint \
134 xf86-video-i128 \ 134 xf86-video-i128 \
135 xf86-video-i740 \ 135 xf86-video-i740 \
136 xf86-video-mga \ 136 xf86-video-mga \
137 xf86-video-neomagic \ 137 xf86-video-neomagic \
138 xf86-video-nv \ 138 xf86-video-nv \
139 xf86-video-radeon \ 139 xf86-video-radeon \
140 xf86-video-s3 \ 140 xf86-video-s3 \
141 xf86-video-s3virge \ 141 xf86-video-s3virge \
142 xf86-video-savage \ 142 xf86-video-savage \
143 xf86-video-siliconmotion \ 143 xf86-video-siliconmotion \
144 xf86-video-tdfx \ 144 xf86-video-tdfx \
145 xf86-video-tga \ 145 xf86-video-tga \
146 xf86-video-trident \ 146 xf86-video-trident \
147 xf86-video-tseng \ 147 xf86-video-tseng \
148 xf86-video-vesa \ 148 xf86-video-vesa \
149 xf86-video-wsfb 149 xf86-video-wsfb
150.endif # ${MACHINE} == "cats" 150.endif # ${MACHINE} == "cats"
151 151
152.if ${MACHINE} == "dreamcast" 152.if ${MACHINE} == "dreamcast"
153SUBDIR+= \ 153SUBDIR+= \
154 xf86-video-wsfb 154 xf86-video-wsfb
155.endif # ${MACHINE} == "dreamcast" 155.endif # ${MACHINE} == "dreamcast"
156 156
157.if ${MACHINE} == "evbarm" 157.if ${MACHINE} == "evbarm"
158SUBDIR+= \ 158SUBDIR+= \
159 xf86-video-modesetting \ 159 xf86-video-modesetting \
160 xf86-video-wsfb 160 xf86-video-wsfb
161.endif # ${MACHINE} == "evbarm" 161.endif # ${MACHINE} == "evbarm"
162 162
163.if ${MACHINE} == "evbmips" 163.if ${MACHINE} == "evbmips"
164SUBDIR+= \ 164SUBDIR+= \
165 xf86-video-siliconmotion \ 165 xf86-video-siliconmotion \
166 xf86-video-sis \ 166 xf86-video-sis \
167 xf86-video-wsfb 167 xf86-video-wsfb
168.endif # ${MACHINE} == "evbmips" 168.endif # ${MACHINE} == "evbmips"
169 169
170.if ${MACHINE} == "ews4800mips" 170.if ${MACHINE} == "ews4800mips"
171SUBDIR+= \ 171SUBDIR+= \
172 xf86-video-wsfb 172 xf86-video-wsfb
173.endif # ${MACHINE} == "ews4800mips" 173.endif # ${MACHINE} == "ews4800mips"
174 174
175.if ${MACHINE} == "hp300" 175.if ${MACHINE} == "hp300"
176SUBDIR+= \ 176SUBDIR+= \
177 xf86-video-wsfb 177 xf86-video-wsfb
178.endif # ${MACHINE} == "hp300" 178.endif # ${MACHINE} == "hp300"
179 179
180.if ${MACHINE} == "hpcarm" || \ 180.if ${MACHINE} == "hpcarm" || \
181 ${MACHINE} == "hpcmips" || \ 181 ${MACHINE} == "hpcmips" || \
182 ${MACHINE} == "hpcsh" 182 ${MACHINE} == "hpcsh"
183SUBDIR+= \ 183SUBDIR+= \
184 xf86-video-wsfb 184 xf86-video-wsfb
185.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh" 185.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
186 186
187.if ${MACHINE} == "ibmnws" 187.if ${MACHINE} == "ibmnws"
188SUBDIR+= \ 188SUBDIR+= \
189 xf86-video-s3 189 xf86-video-s3
190.endif # ${MACHINE} == "ibmnws" 190.endif # ${MACHINE} == "ibmnws"
191 191
192.if ${MACHINE} == "luna68k" 192.if ${MACHINE} == "luna68k"
193SUBDIR+= \ 193SUBDIR+= \
194 xf86-video-wsfb 194 xf86-video-wsfb
195.endif # ${MACHINE} == "luna68k" 195.endif # ${MACHINE} == "luna68k"
196 196
197.if ${MACHINE} == "mac68k" 197.if ${MACHINE} == "mac68k"
198SUBDIR+= \ 198SUBDIR+= \
199 xf86-video-wsfb 199 xf86-video-wsfb
200.endif # ${MACHINE} == "mac68k" 200.endif # ${MACHINE} == "mac68k"
201 201
202.if ${MACHINE} == "macppc" 202.if ${MACHINE} == "macppc"
203SUBDIR+= \ 203SUBDIR+= \
204 xf86-video-ati \ 204 xf86-video-ati \
205 xf86-video-chips \ 205 xf86-video-chips \
206 xf86-video-mach64 \ 206 xf86-video-mach64 \
207 xf86-video-mga \ 207 xf86-video-mga \
208 xf86-video-nv \ 208 xf86-video-nv \
209 xf86-video-radeon \ 209 xf86-video-radeon \
210 xf86-video-r128 \ 210 xf86-video-r128 \
211 xf86-video-tdfx \ 211 xf86-video-tdfx \
212 xf86-video-wsfb 212 xf86-video-wsfb
213# xf86-video-imstt 213# xf86-video-imstt
214.endif # ${MACHINE} == "macppc" 214.endif # ${MACHINE} == "macppc"
215 215
216.if ${MACHINE} == "netwinder" 216.if ${MACHINE} == "netwinder"
217SUBDIR+= \ 217SUBDIR+= \
218 xf86-video-wsfb 218 xf86-video-wsfb
219# xf86-video-igs 219# xf86-video-igs
220.endif # ${MACHINE} == "netwinder" 220.endif # ${MACHINE} == "netwinder"
221 221
222.if ${MACHINE} == "newsmips" 222.if ${MACHINE} == "newsmips"
223SUBDIR+= \ 223SUBDIR+= \
224 xf86-video-wsfb 224 xf86-video-wsfb
225.endif # ${MACHINE} == "newsmips" 225.endif # ${MACHINE} == "newsmips"
226 226
227.if ${MACHINE} == "ofppc" 227.if ${MACHINE} == "ofppc"
228SUBDIR+= \ 228SUBDIR+= \
229 xf86-video-ati \ 229 xf86-video-ati \
230 xf86-video-chips \ 230 xf86-video-chips \
231 xf86-video-mach64 \ 231 xf86-video-mach64 \
232 xf86-video-mga \ 232 xf86-video-mga \
233 xf86-video-nv \ 233 xf86-video-nv \
234 xf86-video-radeon \ 234 xf86-video-radeon \
235 xf86-video-r128 \ 235 xf86-video-r128 \
236 xf86-video-tdfx \ 236 xf86-video-tdfx \
237 xf86-video-wsfb 237 xf86-video-wsfb
238.endif # ${MACHINE} == "ofppc" 238.endif # ${MACHINE} == "ofppc"
239 239
240.if ${MACHINE} == "prep" 240.if ${MACHINE} == "prep"
241SUBDIR+= \ 241SUBDIR+= \
242 xf86-video-cirrus \ 242 xf86-video-cirrus \
243 xf86-video-cirrus_alpine \ 243 xf86-video-cirrus_alpine \
244 xf86-video-mga \ 244 xf86-video-mga \
245 xf86-video-s3 245 xf86-video-s3
246.endif # ${MACHINE} == "prep" 246.endif # ${MACHINE} == "prep"
247 247
248.if ${MACHINE} == "sgimips" 248.if ${MACHINE} == "sgimips"
249SUBDIR+= \ 249SUBDIR+= \
250 xf86-video-crime \ 250 xf86-video-crime \
251 xf86-video-cirrus \ 251 xf86-video-cirrus \
252 xf86-video-glint \ 252 xf86-video-glint \
253 xf86-video-mga \ 253 xf86-video-mga \
254 xf86-video-newport \ 254 xf86-video-newport \
255 xf86-video-s3 \ 255 xf86-video-s3 \
256 xf86-video-wsfb 256 xf86-video-wsfb
257.endif # ${MACHINE} == "sgimips" 257.endif # ${MACHINE} == "sgimips"
258 258
259.if ${MACHINE} == "shark" 259.if ${MACHINE} == "shark"
260SUBDIR+= \ 260SUBDIR+= \
261 xf86-video-chips \ 261 xf86-video-chips \
262 xf86-video-igs \ 262 xf86-video-igs \
263 xf86-video-wsfb 263 xf86-video-wsfb
264.endif # ${MACHINE} == "shark" 264.endif # ${MACHINE} == "shark"
265 265
266.if ${MACHINE} == "sparc" || \ 266.if ${MACHINE} == "sparc" || \
267 ${MACHINE} == "sparc64" 267 ${MACHINE} == "sparc64"
268SUBDIR+= \ 268SUBDIR+= \
269 xf86-video-ag10e \ 269 xf86-video-ag10e \
270 xf86-video-ati \ 270 xf86-video-ati \
271 xf86-video-glint \ 271 xf86-video-glint \
272 xf86-video-mach64 \ 272 xf86-video-mach64 \
273 xf86-video-mga \ 273 xf86-video-mga \
274 xf86-video-r128 \ 274 xf86-video-r128 \
275 xf86-video-radeon \ 275 xf86-video-radeon \
276 xf86-video-suncg6 \ 276 xf86-video-suncg6 \
277 xf86-video-sunffb \ 277 xf86-video-sunffb \
278 xf86-video-sunleo \ 278 xf86-video-sunleo \
279 xf86-video-wsfb 279 xf86-video-wsfb
280.if ${MACHINE} == "sparc" 280.if ${MACHINE} == "sparc"
281SUBDIR+= \ 281SUBDIR+= \
282 xf86-video-pnozz \ 282 xf86-video-pnozz \
283 xf86-video-suncg14 \ 283 xf86-video-suncg14 \
284 xf86-video-suntcx 284 xf86-video-suntcx
285.endif # ${MACHINE} == "sparc" 285.endif # ${MACHINE} == "sparc"
286.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" 286.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
287 287
288.if ${MACHINE} == "vax" 288.if ${MACHINE} == "vax"
289SUBDIR+= \ 289SUBDIR+= \
290 xf86-video-wsfb 290 xf86-video-wsfb
291.endif # ${MACHINE} == "vax" 291.endif # ${MACHINE} == "vax"
292 292
293.if ${MACHINE} == "zaurus" 293.if ${MACHINE} == "zaurus"
294SUBDIR+= \ 294SUBDIR+= \
295 xf86-video-wsfb 295 xf86-video-wsfb
296.endif # ${MACHINE} == "zaurus" 296.endif # ${MACHINE} == "zaurus"
297 297
298.include <bsd.subdir.mk> 298.include <bsd.subdir.mk>
cvs diff -r1.1 -r1.2 src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile (switch to unified diff)

--- src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile 2009/11/28 17:27:30 1.1
+++ src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile 2015/11/06 21:32:22 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2009/11/28 17:27:30 mbalmer Exp $ 1# $NetBSD: Makefile,v 1.2 2015/11/06 21:32:22 szptvlfn Exp $
2 2
3DRIVER= xf86-input-elographics 3DRIVER= xf86-input-elographics
4DRIVER_NAME= elographics_drv 4DRIVER_NAME= elographics_drv
5 5
6SRCS= xf86Elo.c 6SRCS= xf86Elo.c
7MAN= elographics.4 7MAN= elographics.4
8 8
9CPPFLAGS+= -DHAVE_CONFIG_H \ 9CPPFLAGS+= -DHAVE_CONFIG_H \
10 -I${X11SRCDIR.${DRIVER}}/../include \ 10 -I${X11SRCDIR.${DRIVER}}/../include
11 11
12COPTS.xf86Elo.c= -Wno-error # XXX deprecated 12COPTS.xf86Elo.c= -Wno-error # XXX deprecated
13 13
14.include "../Makefile.xf86-driver" 14.include "../Makefile.xf86-driver"
cvs diff -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/composite/Makefile (switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/composite/Makefile 2009/08/22 02:40:26 1.4
+++ src/external/mit/xorg/server/xorg-server/composite/Makefile 2015/11/06 21:32:22 1.5
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:26 mrg Exp $ 1# $NetBSD: Makefile,v 1.5 2015/11/06 21:32:22 szptvlfn Exp $
2 2
3.include "../Makefile.serverlib" 3.include "../Makefile.serverlib"
4.include "../Makefile.servermod" 4.include "../Makefile.servermod"
5 5
6LIB= composite 6LIB= composite
7.PATH: ${X11SRCDIR.xorg-server}/composite 7.PATH: ${X11SRCDIR.xorg-server}/composite
8 8
9SRCS= compalloc.c compext.c compint.h compinit.c compwindow.c \ 9SRCS= compalloc.c compext.c compint.h compinit.c compwindow.c \
10 compoverlay.c 10 compoverlay.c
11 11
12CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} ${X11FLAGS.DIX} ${X11INCS.DIX} 12CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} ${X11FLAGS.DIX} ${X11INCS.DIX}
13 13
14CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ 14CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
15 -I${X11SRCDIR.xorg-server}/mi \ 15 -I${X11SRCDIR.xorg-server}/mi \
16 -I${X11SRCDIR.xorg-server}/Xext \ 16 -I${X11SRCDIR.xorg-server}/Xext \
17 -I${X11SRCDIR.xorg-server}/render \ 17 -I${X11SRCDIR.xorg-server}/render \
18 -I${X11SRCDIR.xorg-server}/xfixes \ 18 -I${X11SRCDIR.xorg-server}/xfixes \
19 -I${X11SRCDIR.xorg-server}/damageext \ 19 -I${X11SRCDIR.xorg-server}/damageext \
20 -I${X11SRCDIR.xorg-server}/miext/damage \ 20 -I${X11SRCDIR.xorg-server}/miext/damage \
21 -I${DESTDIR}${X11INCDIR}/X11 \ 21 -I${DESTDIR}${X11INCDIR}/X11 \
22 -I${DESTDIR}${X11INCDIR}/pixman-1 \ 22 -I${DESTDIR}${X11INCDIR}/pixman-1 \
23 -I${X11SRCDIR.xorg-server}/../include \ 23 -I${X11SRCDIR.xorg-server}/../include
24 24
25# XXX 25# XXX
26COPTS.compwindow.c= -Wno-error 26COPTS.compwindow.c= -Wno-error
27COPTS.compext.c= -Wno-error 27COPTS.compext.c= -Wno-error
28COPTS.compinit.c= -Wno-error 28COPTS.compinit.c= -Wno-error
29 29
30.include <bsd.x11.mk> 30.include <bsd.x11.mk>
31.include <bsd.lib.mk> 31.include <bsd.lib.mk>
cvs diff -r1.1 -r1.2 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile (switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile 2014/03/01 19:39:03 1.1
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile 2015/11/06 21:32:22 1.2
@@ -1,94 +1,94 @@ @@ -1,94 +1,94 @@
1# $NetBSD: Makefile,v 1.1 2014/03/01 19:39:03 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.2 2015/11/06 21:32:22 szptvlfn Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= X68k 5PROG= X68k
6BINMODE= 4711 6BINMODE= 4711
7 7
8SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X 8SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X
9 9
10FILES= X68kConfig 10FILES= X68kConfig
11FILESDIR= ${X11ETCDIR} 11FILESDIR= ${X11ETCDIR}
12 12
13.include "../../../Makefile.serverlib" 13.include "../../../Makefile.serverlib"
14.include "../../../Makefile.servermod" 14.include "../../../Makefile.servermod"
15 15
16WARNS?= 2 16WARNS?= 2
17 17
18.PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/x68k 18.PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/x68k
19SRCS= x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \ 19SRCS= x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \
20 x68kFb.c x68kGraph.c x68kText.c 20 x68kFb.c x68kGraph.c x68kText.c
21 21
22.PATH: ${X11SRCDIR.xorg-server}/Xext 22.PATH: ${X11SRCDIR.xorg-server}/Xext
23SRCS+= dpmsstubs.c 23SRCS+= dpmsstubs.c
24 24
25.PATH: ${X11SRCDIR.xorg-server}/Xi 25.PATH: ${X11SRCDIR.xorg-server}/Xi
26SRCS+= stubs.c 26SRCS+= stubs.c
27 27
28.PATH: ${X11SRCDIR.xorg-server}/mi 28.PATH: ${X11SRCDIR.xorg-server}/mi
29SRCS+= miinitext.c 29SRCS+= miinitext.c
30 30
31.PATH: ${X11SRCDIR.xorg-server}/fb 31.PATH: ${X11SRCDIR.xorg-server}/fb
32SRCS+= fbcmap_mi.c 32SRCS+= fbcmap_mi.c
33 33
34CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ 34CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
35 -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \ 35 -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
36 -I${X11SRCDIR.xorg-server}/fb \ 36 -I${X11SRCDIR.xorg-server}/fb \
37 -I${X11SRCDIR.xorg-server}/mi \ 37 -I${X11SRCDIR.xorg-server}/mi \
38 -I${X11SRCDIR.xorg-server}/render \ 38 -I${X11SRCDIR.xorg-server}/render \
39 -I${DESTDIR}${X11INCDIR}/X11 \ 39 -I${DESTDIR}${X11INCDIR}/X11
40 40
41CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ 41CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
42 -UXF86DRI -UXF86BIGFONT 42 -UXF86DRI -UXF86BIGFONT
43 43
44CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\" 44CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
45 45
46.include "../../../Makefile.Xserver" 46.include "../../../Makefile.Xserver"
47 47
48LDADD+= ${LDADD.dix} \ 48LDADD+= ${LDADD.dix} \
49 ${LDADD.fb} \ 49 ${LDADD.fb} \
50 ${LDADD.mi} \ 50 ${LDADD.mi} \
51 ${LDADD.xkb} \ 51 ${LDADD.xkb} \
52 ${LDADD.xkbstubs} \ 52 ${LDADD.xkbstubs} \
53 ${LDADD.randr} \ 53 ${LDADD.randr} \
54 ${LDADD.Xext} \ 54 ${LDADD.Xext} \
55 ${LDADD.composite} \ 55 ${LDADD.composite} \
56 ${LDADD.render} \ 56 ${LDADD.render} \
57 ${LDADD.os} \ 57 ${LDADD.os} \
58 ${LDADD.xfixes} \ 58 ${LDADD.xfixes} \
59 ${LDADD.damageext} \ 59 ${LDADD.damageext} \
60 ${LDADD.miext/damage} \ 60 ${LDADD.miext/damage} \
61 ${LDADD.miext/shadow} \ 61 ${LDADD.miext/shadow} \
62 ${LDADD.miext/sync} \ 62 ${LDADD.miext/sync} \
63 ${LDADD.Xi} \ 63 ${LDADD.Xi} \
64 -lXfont \ 64 -lXfont \
65 -lpixman-1 \ 65 -lpixman-1 \
66 -lXext \ 66 -lXext \
67 -lX11 \ 67 -lX11 \
68 -lz \ 68 -lz \
69 -lm 69 -lm
70 70
71DPADD+= ${LDADD.dix} \ 71DPADD+= ${LDADD.dix} \
72 ${DPADD.fb} \ 72 ${DPADD.fb} \
73 ${DPADD.mi} \ 73 ${DPADD.mi} \
74 ${DPADD.xkb} \ 74 ${DPADD.xkb} \
75 ${DPADD.randr} \ 75 ${DPADD.randr} \
76 ${DPADD.Xext} \ 76 ${DPADD.Xext} \
77 ${DPADD.composite} \ 77 ${DPADD.composite} \
78 ${DPADD.render} \ 78 ${DPADD.render} \
79 ${DPADD.os} \ 79 ${DPADD.os} \
80 ${DPADD.xfixes} \ 80 ${DPADD.xfixes} \
81 ${DPADD.damageext} \ 81 ${DPADD.damageext} \
82 ${DPADD.miext/damage} \ 82 ${DPADD.miext/damage} \
83 ${DPADD.miext/shadow} \ 83 ${DPADD.miext/shadow} \
84 ${DPADD.miext/sync} \ 84 ${DPADD.miext/sync} \
85 ${DPADD.Xi} \ 85 ${DPADD.Xi} \
86 ${LIBXFONT} \ 86 ${LIBXFONT} \
87 ${LIBPIXMAN-1} \ 87 ${LIBPIXMAN-1} \
88 ${LIBXEXT} \ 88 ${LIBXEXT} \
89 ${LIBX11} \ 89 ${LIBX11} \
90 ${LIBZ} \ 90 ${LIBZ} \
91 ${LIBM} 91 ${LIBM}
92 92
93.include <bsd.x11.mk> 93.include <bsd.x11.mk>
94.include <bsd.prog.mk> 94.include <bsd.prog.mk>