diff options
| author | rtr <rtr@pkgsrc.org> | 2008-09-21 09:59:09 +0000 |
|---|---|---|
| committer | rtr <rtr@pkgsrc.org> | 2008-09-21 09:59:09 +0000 |
| commit | 16451925408df23af9e150bd392b4e7bb28f1a2c (patch) | |
| tree | 7da42f8757ff5261b36c79f18043611ab602be38 | |
| parent | 8618abc11d3761cf376925b229b1c085ed1d632b (diff) | |
| download | pkgsrc-16451925408df23af9e150bd392b4e7bb28f1a2c.tar.gz | |
* escape new line in conditional
* make sure X11BASE is defined before checking if it is empty
| -rw-r--r-- | mk/defaults/mk.conf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 2795917f0a6..64ea96d339e 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.176.6.1 2008/09/21 02:17:31 cube Exp $ +# $NetBSD: mk.conf,v 1.176.6.2 2008/09/21 09:59:09 rtr Exp $ # # This file provides default values for variables that may be overridden @@ -203,9 +203,10 @@ PKGSRC_RUN_TEST?= no # Possible: yes, no # Default: no -.if (!empty(MACHINE_PLATFORM:MDarwin-*-*) && +.if (!empty(MACHINE_PLATFORM:MDarwin-*-*) && \ empty(MACHINE_PLATFORM:MDarwin-9.*-*)) || \ - (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(X11BASE:M/usr/X11R7)) || \ + (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ + defined(X11BASE) && empty(X11BASE:M/usr/X11R7)) || \ (defined(X11_TYPE) && ${X11_TYPE} != "native") PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ freetype2 glu randrproto renderproto xcursor |