| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.874 2015/09/30 22:58:02 rjs Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.875 2015/10/13 03:14:16 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 | # |
| @@ -1288,27 +1288,27 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM | | | @@ -1288,27 +1288,27 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM |
1288 | font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \ | | 1288 | font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \ |
1289 | font-sony-misc font-util ttf-bitstream-vera encodings | | 1289 | font-sony-misc font-util ttf-bitstream-vera encodings |
1290 | X11SRCDIR.${_dir}?= ${X11SRCDIRMIT}/${_dir}/dist | | 1290 | X11SRCDIR.${_dir}?= ${X11SRCDIRMIT}/${_dir}/dist |
1291 | .endfor | | 1291 | .endfor |
1292 | | | 1292 | |
1293 | .for _i in \ | | 1293 | .for _i in \ |
1294 | elographics keyboard mouse synaptics vmmouse void ws | | 1294 | elographics keyboard mouse synaptics vmmouse void ws |
1295 | X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist | | 1295 | X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist |
1296 | .endfor | | 1296 | .endfor |
1297 | | | 1297 | |
1298 | .for _v in \ | | 1298 | .for _v in \ |
1299 | ag10e apm ark ast ati ati-kms chips cirrus crime \ | | 1299 | ag10e apm ark ast ati ati-kms chips cirrus crime \ |
1300 | geode glint i128 i740 igs imstt intel intel-old mach64 mga \ | | 1300 | geode glint i128 i740 igs imstt intel intel-old mach64 mga \ |
1301 | neomagic newport nsc nv nvxbox openchrome pnozz \ | | 1301 | neomagic newport nouveau nsc nv nvxbox openchrome pnozz \ |
1302 | r128 radeonhd rendition \ | | 1302 | r128 radeonhd rendition \ |
1303 | s3 s3virge savage siliconmotion sis suncg14 \ | | 1303 | s3 s3virge savage siliconmotion sis suncg14 \ |
1304 | suncg6 sunffb sunleo suntcx \ | | 1304 | suncg6 sunffb sunleo suntcx \ |
1305 | tdfx tga trident tseng vesa vga vmware wsfb xgi | | 1305 | tdfx tga trident tseng vesa vga vmware wsfb xgi |
1306 | X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist | | 1306 | X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist |
1307 | .endfor | | 1307 | .endfor |
1308 | | | 1308 | |
1309 | # Only install the radeon firmware on DRM-happy systems. | | 1309 | # Only install the radeon firmware on DRM-happy systems. |
1310 | .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" | | 1310 | .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" |
1311 | MKRADEONFIRMWARE?= yes | | 1311 | MKRADEONFIRMWARE?= yes |
1312 | .endif | | 1312 | .endif |
1313 | MKRADEONFIRMWARE?= no | | 1313 | MKRADEONFIRMWARE?= no |
1314 | | | 1314 | |