| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.860 2015/07/23 05:44:26 mrg Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.861 2015/07/23 07:44:46 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 | |
11 | MAKECONF?= /etc/mk.conf | | 11 | MAKECONF?= /etc/mk.conf |
12 | .-include "${MAKECONF}" | | 12 | .-include "${MAKECONF}" |
13 | | | 13 | |
14 | # | | 14 | # |
| @@ -1276,27 +1276,28 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib | | | @@ -1276,27 +1276,28 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib |
1276 | xf86vidmode composite damage trap gl randr fontcache xf86dri \ | | 1276 | xf86vidmode composite damage trap gl randr fontcache xf86dri \ |
1277 | present xcb- | | 1277 | present xcb- |
1278 | X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist | | 1278 | X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist |
1279 | .endfor | | 1279 | .endfor |
1280 | | | 1280 | |
1281 | .for _dir in \ | | 1281 | .for _dir in \ |
1282 | xtrans fontconfig freetype evieext mkfontscale bdftopcf \ | | 1282 | xtrans fontconfig freetype evieext mkfontscale bdftopcf \ |
1283 | xkbcomp xorg-cf-files imake xorg-server xbiff xkeyboard-config \ | | 1283 | xkbcomp xorg-cf-files imake xorg-server xbiff xkeyboard-config \ |
1284 | xbitmaps appres xeyes xev xedit sessreg pixman \ | | 1284 | xbitmaps appres xeyes xev xedit sessreg pixman \ |
1285 | beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \ | | 1285 | beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \ |
1286 | glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \ | | 1286 | glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \ |
1287 | ico iceauth listres lndir \ | | 1287 | ico iceauth listres lndir \ |
1288 | luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \ | | 1288 | luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \ |
1289 | setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \ | | 1289 | rstart setxkbmap showfont smproxy twm viewres \ |
| | | 1290 | x11perf xauth xcalc xclipboard \ |
1290 | xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \ | | 1291 | xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \ |
1291 | xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \ | | 1292 | xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \ |
1292 | xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \ | | 1293 | xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \ |
1293 | xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \ | | 1294 | xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \ |
1294 | xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \ | | 1295 | xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \ |
1295 | xwininfo xwud xkbprint xkbevd \ | | 1296 | xwininfo xwud xkbprint xkbevd \ |
1296 | xterm xwd xfs xfsinfo xtrap xkbutils xkbcomp \ | | 1297 | xterm xwd xfs xfsinfo xtrap xkbutils xkbcomp \ |
1297 | xkeyboard-config xinput xcb-util xorg-docs \ | | 1298 | xkeyboard-config xinput xcb-util xorg-docs \ |
1298 | font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \ | | 1299 | font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \ |
1299 | font-adobe-utopia-75dpi font-adobe-utopia-type1 \ | | 1300 | font-adobe-utopia-75dpi font-adobe-utopia-type1 \ |
1300 | font-alias \ | | 1301 | font-alias \ |
1301 | font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi \ | | 1302 | font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi \ |
1302 | font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 \ | | 1303 | font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 \ |