Sun Mar 5 11:52:39 2017 UTC ()
add some missing @foo@ cases for libepoxy, libxshmfence and xorg-server.


(mrg)
diff -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/Makefile
diff -r1.5 -r1.6 src/external/mit/xorg/lib/libxshmfence/Makefile
diff -r1.27 -r1.28 src/external/mit/xorg/server/xorg-server/Makefile
cvs diff -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libepoxy/Makefile 2016/08/18 07:44:32 1.1
+++ src/external/mit/xorg/lib/libepoxy/Makefile 2017/03/05 11:52:38 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2016/08/18 07:44:32 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2017/03/05 11:52:38 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= epoxy 5LIB= epoxy
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/epoxy 7.PATH: ${X11SRCDIR.${LIB}}/include/epoxy
8.PATH: ${X11SRCDIR.${LIB}}/../src 8.PATH: ${X11SRCDIR.${LIB}}/../src
9 9
10SRCS= \ 10SRCS= \
11 dispatch_common.c \ 11 dispatch_common.c \
12 dispatch_glx.c \ 12 dispatch_glx.c \
13 gl_generated_dispatch.c \ 13 gl_generated_dispatch.c \
14 glx_generated_dispatch.c 14 glx_generated_dispatch.c
@@ -16,16 +16,18 @@ SRCS.EGL= \ @@ -16,16 +16,18 @@ SRCS.EGL= \
16 dispatch_egl.c \ 16 dispatch_egl.c \
17 egl_generated_dispatch.c 17 egl_generated_dispatch.c
18 18
19INCSDIR=${X11INCDIR}/epoxy 19INCSDIR=${X11INCDIR}/epoxy
20INCS= \ 20INCS= \
21 gl.h gl_generated.h \ 21 gl.h gl_generated.h \
22 glx.h glx_generated.h \ 22 glx.h glx_generated.h \
23 egl.h egl_generated.h 23 egl.h egl_generated.h
24 24
25CPPFLAGS+= -I${X11SRCDIR.${LIB}}/src 25CPPFLAGS+= -I${X11SRCDIR.${LIB}}/src
26CPPFLAGS+= ${X11FLAGS.CONNECTION} 26CPPFLAGS+= ${X11FLAGS.CONNECTION}
27 27
28PKGCONFIG= epoxy 28PKGCONFIG= epoxy
 29PKGCONFIG_SED_FLAGS= \
 30 -e "s,@DLOPEN_LIBS@,,"
29 31
30.include <bsd.x11.mk> 32.include <bsd.x11.mk>
31.include <bsd.lib.mk> 33.include <bsd.lib.mk>
cvs diff -r1.5 -r1.6 src/external/mit/xorg/lib/libxshmfence/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libxshmfence/Makefile 2016/09/27 19:18:42 1.5
+++ src/external/mit/xorg/lib/libxshmfence/Makefile 2017/03/05 11:52:39 1.6
@@ -1,33 +1,38 @@ @@ -1,33 +1,38 @@
1# $NetBSD: Makefile,v 1.5 2016/09/27 19:18:42 joerg Exp $ 1# $NetBSD: Makefile,v 1.6 2017/03/05 11:52:39 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= xshmfence 5LIB= xshmfence
6 6
7XSHMFENCEDIR= ${X11SRCDIR.${LIB}} 7XSHMFENCEDIR= ${X11SRCDIR.${LIB}}
8.PATH: ${XSHMFENCEDIR}/src 8.PATH: ${XSHMFENCEDIR}/src
9SRCS= xshmfence_alloc.c xshmfence_semaphore.c 9SRCS= xshmfence_alloc.c xshmfence_semaphore.c
10 10
11INCS= xshmfence.h 11INCS= xshmfence.h
12INCSDIR=${X11INCDIR}/X11 12INCSDIR=${X11INCDIR}/X11
13 13
14CPPFLAGS+= -DSHMDIR=\"/var/shm\" 14CPPFLAGS+= -DSHMDIR=\"/var/shm\"
15CPPFLAGS+= -DHAVE_SEMAPHORE 15CPPFLAGS+= -DHAVE_SEMAPHORE
16# XXX 16# XXX
17CPPFLAGS+= -DLIBXSHM_PAGESIZE=4096 17CPPFLAGS+= -DLIBXSHM_PAGESIZE=4096
18 18
19LDADD+= -lrt 19LDADD+= -lrt
20DPADD+= ${LIBRT} 20DPADD+= ${LIBRT}
21 21
22NOMAN= # defined 22NOMAN= # defined
23 23
24PKGDIST= ${LIB} 24PKGDIST= ${LIB}
 25# XXX PTHREAD_LIBS really should be -pthread for more general
 26# XXX but the package doesn't really do this.
 27PKGCONFIG_SED_FLAGS= \
 28 -e "s,@XPROTO_CFLAGS@,-I${X11INCDIR},; \
 29 s,@PTHREAD_LIBS@,-lpthread,"
25 30
26COPTS.xshmfence_semaphore.c += -Wno-stack-protector 31COPTS.xshmfence_semaphore.c += -Wno-stack-protector
27 32
28.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc" 33.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
29COPTS.xshmfence_semaphore.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :} 34COPTS.xshmfence_semaphore.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
30.endif 35.endif
31 36
32.include <bsd.x11.mk> 37.include <bsd.x11.mk>
33.include <bsd.lib.mk> 38.include <bsd.lib.mk>
cvs diff -r1.27 -r1.28 src/external/mit/xorg/server/xorg-server/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/Makefile 2016/08/21 20:51:04 1.27
+++ src/external/mit/xorg/server/xorg-server/Makefile 2017/03/05 11:52:39 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2016/08/21 20:51:04 mrg Exp $ 1# $NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
7SUBDIR= doc include .WAIT 7SUBDIR= doc include .WAIT
8SUBDIR+= glx 8SUBDIR+= glx
9SUBDIR+= dix fb mi Xext miext os randr render  9SUBDIR+= dix fb mi Xext miext os randr render
10SUBDIR+= present pseudoramiX 10SUBDIR+= present pseudoramiX
11SUBDIR+= Xi xkb xkbstubs dbe record xfixes 11SUBDIR+= Xi xkb xkbstubs dbe record xfixes
12SUBDIR+= damageext composite config .WAIT 12SUBDIR+= damageext composite config .WAIT
13 13
14# XXX 14# XXX
@@ -19,19 +19,20 @@ SUBDIR+= dri3 @@ -19,19 +19,20 @@ SUBDIR+= dri3
19.if ${HAVE_XORG_GLAMOR} != "no" 19.if ${HAVE_XORG_GLAMOR} != "no"
20SUBDIR+= glamor 20SUBDIR+= glamor
21.endif 21.endif
22 22
23# And finally, build the servers. 23# And finally, build the servers.
24SUBDIR+= .WAIT hw 24SUBDIR+= .WAIT hw
25 25
26.PATH: ${X11SRCDIR.xorg-server} 26.PATH: ${X11SRCDIR.xorg-server}
27 27
28PKGCONFIG= xorg-server 28PKGCONFIG= xorg-server
29# Use -fvisibility=hidden for symbol_visibility? 29# Use -fvisibility=hidden for symbol_visibility?
30PKGCONFIG_SED_FLAGS= \ 30PKGCONFIG_SED_FLAGS= \
31 -e "s,@sysconfigdir@,${X11ETCDIR},; \ 31 -e "s,@sysconfigdir@,${X11ETCDIR},; \
 32 s,@XORG_DRIVER_LIBS@,,; \
32 s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \ 33 s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
33 s,@symbol_visibility@,," 34 s,@symbol_visibility@,,"
34 35
35.include <bsd.x11.mk> 36.include <bsd.x11.mk>
36.include <bsd.man.mk> 37.include <bsd.man.mk>
37.include <bsd.subdir.mk> 38.include <bsd.subdir.mk>