Fri Oct 17 13:05:05 2008 UTC ()
Prefer "pixman" package from "pkgsrc" under Mac OS X Leopard. The builtin
version is already too old for the "cairo" package.


(tron)
diff -r1.177 -r1.178 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.177 -r1.178 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2008/10/05 21:36:35 1.177
+++ pkgsrc/mk/defaults/mk.conf 2008/10/17 13:05:05 1.178
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.177 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: mk.conf,v 1.178 2008/10/17 13:05:05 tron Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -201,27 +201,27 @@ PKGSRC_RUN_TEST?= no @@ -201,27 +201,27 @@ PKGSRC_RUN_TEST?= no
201# numbers on your machine. The package security/bitstir may help here. 201# numbers on your machine. The package security/bitstir may help here.
202# 202#
203# Possible: yes, no 203# Possible: yes, no
204# Default: no 204# Default: no
205 205
206.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ 206.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
207 exists(/usr/X11R7/lib/libX11.so)) 207 exists(/usr/X11R7/lib/libX11.so))
208PREFER_PKGSRC?= 208PREFER_PKGSRC?=
209.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ 209.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
210 (defined(X11_TYPE) && ${X11_TYPE} != "native") 210 (defined(X11_TYPE) && ${X11_TYPE} != "native")
211PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ 211PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \
212 freetype2 glu randrproto renderproto xcursor 212 freetype2 glu randrproto renderproto xcursor
213.else 213.else
214PREFER_PKGSRC?= Xft2 fontconfig 214PREFER_PKGSRC?= fontconfig pixman Xft2
215.endif 215.endif
216PREFER_NATIVE?= yes 216PREFER_NATIVE?= yes
217# 217#
218# When building packages, whether to prefer the pkgsrc or native 218# When building packages, whether to prefer the pkgsrc or native
219# versions of software that's also part of the base system. Its value 219# versions of software that's also part of the base system. Its value
220# can be either yes/no, or a list of packages as named in the 220# can be either yes/no, or a list of packages as named in the
221# BUILDLINK_PACKAGES line in a package's buildlink3.mk file. 221# BUILDLINK_PACKAGES line in a package's buildlink3.mk file.
222# Preferences are determined by the most specific instance of the 222# Preferences are determined by the most specific instance of the
223# package in either PREFER_PKGSRC or PREFER_NATIVE. If a package is 223# package in either PREFER_PKGSRC or PREFER_NATIVE. If a package is
224# specified in neither or in both variables, then PREFER_PKGSRC has 224# specified in neither or in both variables, then PREFER_PKGSRC has
225# precedence over PREFER_NATIVE. 225# precedence over PREFER_NATIVE.
226# 226#
227# Possible: yes, no, or a list of packages 227# Possible: yes, no, or a list of packages