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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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 \
@@ -31,27 +31,27 @@ SRCS= \ @@ -31,27 +31,27 @@ SRCS= \
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
cvs diff -r1.74 -r1.75 src/external/mit/xorg/server/drivers/Makefile (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -26,27 +26,27 @@ SUBDIR+= \ @@ -26,27 +26,27 @@ SUBDIR+= \
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 \
cvs diff -r1.1 -r1.2 src/external/mit/xorg/server/drivers/xf86-input-elographics/Makefile (expand / 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 (expand / 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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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"
@@ -26,27 +26,27 @@ SRCS+= dpmsstubs.c @@ -26,27 +26,27 @@ SRCS+= dpmsstubs.c
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} \