Fri Jun 10 03:36:55 2016 UTC ()
define XORG_SERVER_SUBDIR to either xorg-server or xorg-server.old.


(mrg)
diff -r1.930 -r1.931 src/share/mk/bsd.own.mk
cvs diff -r1.930 -r1.931 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2016/06/10 00:17:48 1.930
+++ src/share/mk/bsd.own.mk 2016/06/10 03:36:55 1.931
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.930 2016/06/10 00:17:48 mrg Exp $ 1# $NetBSD: bsd.own.mk,v 1.931 2016/06/10 03:36:55 mrg 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#
@@ -1348,29 +1348,38 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi @@ -1348,29 +1348,38 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi
1348 fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \ 1348 fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \
1349 pthread-stubs 1349 pthread-stubs
1350X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist 1350X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
1351.endfor 1351.endfor
1352 1352
1353.for _proto in \ 1353.for _proto in \
1354 xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \ 1354 xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
1355 xinerama dri2 dri3 render resource record video xf86dga xf86misc \ 1355 xinerama dri2 dri3 render resource record video xf86dga xf86misc \
1356 xf86vidmode composite damage trap gl randr fontcache xf86dri \ 1356 xf86vidmode composite damage trap gl randr fontcache xf86dri \
1357 present xcb- 1357 present xcb-
1358X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist 1358X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
1359.endfor 1359.endfor
1360 1360
 1361# During transition from xorg-server 1.10 to 1.18
 1362.if 1
 1363XORG_SERVER_SUBDIR?=xorg-server
 1364.else
 1365XORG_SERVER_SUBDIR?=xorg-server.old
 1366.endif
 1367
 1368X11SRCDIR.xorg-server?= ${X11SRCDIRMIT}/${XORG_SERVER_SUBDIR}/dist
 1369
1361.for _dir in \ 1370.for _dir in \
1362 xtrans fontconfig freetype evieext mkfontscale bdftopcf \ 1371 xtrans fontconfig freetype evieext mkfontscale bdftopcf \
1363 xkbcomp xorg-cf-files imake xorg-server xbiff xkeyboard-config \ 1372 xkbcomp xorg-cf-files imake xbiff xkeyboard-config \
1364 xbitmaps appres xeyes xev xedit sessreg pixman \ 1373 xbitmaps appres xeyes xev xedit sessreg pixman \
1365 beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \ 1374 beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
1366 glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \ 1375 glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \
1367 ico iceauth listres lndir \ 1376 ico iceauth listres lndir \
1368 luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \ 1377 luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
1369 rstart setxkbmap showfont smproxy twm viewres \ 1378 rstart setxkbmap showfont smproxy twm viewres \
1370 x11perf xauth xcalc xclipboard \ 1379 x11perf xauth xcalc xclipboard \
1371 xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \ 1380 xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \
1372 xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \ 1381 xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
1373 xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \ 1382 xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \
1374 xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \ 1383 xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \
1375 xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \ 1384 xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
1376 xwininfo xwud xkbprint xkbevd \ 1385 xwininfo xwud xkbprint xkbevd \