From ff647e5cab4de762ab6401990b9cd1986865cc96 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 3 Jul 2012 10:22:52 +0000 Subject: Do not prefer expat on NetBSD, if the base system has it. --- mk/defaults/mk.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mk/defaults') diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index e72857afc0e..78bb529c04d 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.211 2012/06/17 14:22:44 wiz Exp $ +# $NetBSD: mk.conf,v 1.212 2012/07/03 10:22:52 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -198,7 +198,10 @@ PKGSRC_RUN_TEST?= no .if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ exists(/usr/X11R7/lib/libX11.so)) -PREFER_PKGSRC?= +.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ + exists(/usr/lib/libexpat.so)) +PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrenderfontconfig \ + freetype2 glu randrproto renderproto xcursor .elif (!empty(MACHINE_PLATFORM:MOpenBSD-*-*) && \ exists(/usr/X11R6/lib/X11/config/xorgversion.def)) PREFER_PKGSRC?= -- cgit v1.2.3