Sun Sep 21 09:59:10 2008 UTC ()
* escape new line in conditional
* make sure X11BASE is defined before checking if it is empty


(rtr)
diff -r1.176.6.1 -r1.176.6.2 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.176.6.1 -r1.176.6.2 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2008/09/21 02:17:31 1.176.6.1
+++ pkgsrc/mk/defaults/mk.conf 2008/09/21 09:59:09 1.176.6.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.176.6.1 2008/09/21 02:17:31 cube Exp $ 1# $NetBSD: mk.conf,v 1.176.6.2 2008/09/21 09:59:09 rtr 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
@@ -193,29 +193,30 @@ PKGSRC_SHOW_PATCH_ERRORMSG?=yes @@ -193,29 +193,30 @@ PKGSRC_SHOW_PATCH_ERRORMSG?=yes
193PKGSRC_RUN_TEST?= no 193PKGSRC_RUN_TEST?= no
194# 194#
195# Many packages bring their own self tests to ensure they basically 195# Many packages bring their own self tests to ensure they basically
196# work. To run these tests after building a package, set this variable 196# work. To run these tests after building a package, set this variable
197# to "yes". 197# to "yes".
198# 198#
199# Note: Some packages make heavy use of the random number generator in 199# Note: Some packages make heavy use of the random number generator in
200# their tests, so need to make sure that there are always enough random 200# their tests, so need to make sure that there are always enough random
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:MDarwin-*-*) && 206.if (!empty(MACHINE_PLATFORM:MDarwin-*-*) && \
207 empty(MACHINE_PLATFORM:MDarwin-9.*-*)) || \ 207 empty(MACHINE_PLATFORM:MDarwin-9.*-*)) || \
208 (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(X11BASE:M/usr/X11R7)) || \ 208 (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
 209 defined(X11BASE) && empty(X11BASE:M/usr/X11R7)) || \
209 (defined(X11_TYPE) && ${X11_TYPE} != "native") 210 (defined(X11_TYPE) && ${X11_TYPE} != "native")
210PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ 211PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \
211 freetype2 glu randrproto renderproto xcursor 212 freetype2 glu randrproto renderproto xcursor
212.elif !empty(MACHINE_PLATFORM:MDarwin-*-*) 213.elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
213PREFER_PKGSRC?= Xft2 fontconfig 214PREFER_PKGSRC?= Xft2 fontconfig
214.else 215.else
215PREFER_PKGSRC?= 216PREFER_PKGSRC?=
216.endif 217.endif
217PREFER_NATIVE?= yes 218PREFER_NATIVE?= yes
218# 219#
219# When building packages, whether to prefer the pkgsrc or native 220# When building packages, whether to prefer the pkgsrc or native
220# versions of software that's also part of the base system. Its value 221# versions of software that's also part of the base system. Its value
221# can be either yes/no, or a list of packages as named in the 222# can be either yes/no, or a list of packages as named in the