Thu Jul 23 05:44:26 2015 UTC ()
add libXpresent.


(mrg)
diff -r1.859 -r1.860 src/share/mk/bsd.own.mk

cvs diff -r1.859 -r1.860 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2015/06/27 16:21:07 1.859
+++ src/share/mk/bsd.own.mk 2015/07/23 05:44:26 1.860
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.859 2015/06/27 16:21:07 matt Exp $ 1# $NetBSD: bsd.own.mk,v 1.860 2015/07/23 05:44:26 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#
@@ -1253,27 +1253,27 @@ X11ETCDIR?= /etc/X11 @@ -1253,27 +1253,27 @@ X11ETCDIR?= /etc/X11
1253X11FONTDIR?= ${X11ROOTDIR}/lib/X11/fonts 1253X11FONTDIR?= ${X11ROOTDIR}/lib/X11/fonts
1254X11INCDIR?= ${X11ROOTDIR}/include 1254X11INCDIR?= ${X11ROOTDIR}/include
1255X11LIBDIR?= ${X11ROOTDIR}/lib/X11 1255X11LIBDIR?= ${X11ROOTDIR}/lib/X11
1256X11MANDIR?= ${X11ROOTDIR}/man 1256X11MANDIR?= ${X11ROOTDIR}/man
1257X11SHAREDIR?= ${X11ROOTDIR}/share 1257X11SHAREDIR?= ${X11ROOTDIR}/share
1258X11USRLIBDIR?= ${X11ROOTDIR}/lib${MLIBDIR:D/${MLIBDIR}} 1258X11USRLIBDIR?= ${X11ROOTDIR}/lib${MLIBDIR:D/${MLIBDIR}}
1259 1259
1260# 1260#
1261# New modular-xorg based builds 1261# New modular-xorg based builds
1262# 1262#
1263X11SRCDIRMIT?= ${X11SRCDIR}/external/mit 1263X11SRCDIRMIT?= ${X11SRCDIR}/external/mit
1264.for _lib in \ 1264.for _lib in \
1265 FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \ 1265 FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
1266 Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpm \ 1266 Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpresent Xpm \
1267 Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \ 1267 Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
1268 fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \ 1268 fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \
1269 pthread-stubs 1269 pthread-stubs
1270X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist 1270X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
1271.endfor 1271.endfor
1272 1272
1273.for _proto in \ 1273.for _proto in \
1274 xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \ 1274 xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
1275 xinerama dri2 dri3 render resource record video xf86dga xf86misc \ 1275 xinerama dri2 dri3 render resource record video xf86dga xf86misc \
1276 xf86vidmode composite damage trap gl randr fontcache xf86dri \ 1276 xf86vidmode composite damage trap gl randr fontcache xf86dri \
1277 present xcb- 1277 present xcb-
1278X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist 1278X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
1279.endfor 1279.endfor