Tue Oct 11 17:10:22 2016 UTC ()
switch evbmips to new xorg


(macallan)
diff -r1.967 -r1.968 src/share/mk/bsd.own.mk
cvs diff -r1.967 -r1.968 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2016/10/07 16:14:28 1.967
+++ src/share/mk/bsd.own.mk 2016/10/11 17:10:22 1.968
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.967 2016/10/07 16:14:28 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.968 2016/10/11 17:10:22 macallan Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -1347,26 +1347,27 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib @@ -1347,26 +1347,27 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
1347 present xcb- 1347 present xcb-
1348X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist 1348X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
1349.endfor 1349.endfor
1350 1350
1351# During transition from xorg-server 1.10 to 1.18 1351# During transition from xorg-server 1.10 to 1.18
1352.if \ 1352.if \
1353 ${MACHINE} == "amd64" || \ 1353 ${MACHINE} == "amd64" || \
1354 ${MACHINE} == "i386" || \ 1354 ${MACHINE} == "i386" || \
1355 ${MACHINE} == "ofppc" || \ 1355 ${MACHINE} == "ofppc" || \
1356 ${MACHINE} == "macppc" || \ 1356 ${MACHINE} == "macppc" || \
1357 ${MACHINE} == "shark" || \ 1357 ${MACHINE} == "shark" || \
1358 ${MACHINE} == "sparc" || \ 1358 ${MACHINE} == "sparc" || \
1359 ${MACHINE} == "sparc64" || \ 1359 ${MACHINE} == "sparc64" || \
 1360 ${MACHINE} == "evbmips" || \
1360 ${MACHINE} == "x68k" 1361 ${MACHINE} == "x68k"
1361HAVE_XORG_SERVER_VER?=118 1362HAVE_XORG_SERVER_VER?=118
1362.else 1363.else
1363HAVE_XORG_SERVER_VER?=110 1364HAVE_XORG_SERVER_VER?=110
1364.endif 1365.endif
1365 1366
1366.if ${HAVE_XORG_SERVER_VER} == "118" 1367.if ${HAVE_XORG_SERVER_VER} == "118"
1367XORG_SERVER_SUBDIR?=xorg-server 1368XORG_SERVER_SUBDIR?=xorg-server
1368. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" 1369. if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
1369HAVE_XORG_GLAMOR?= yes 1370HAVE_XORG_GLAMOR?= yes
1370. endif 1371. endif
1371.else 1372.else
1372XORG_SERVER_SUBDIR?=xorg-server.old 1373XORG_SERVER_SUBDIR?=xorg-server.old