diff options
| author | tron <tron@pkgsrc.org> | 2013-01-23 17:02:23 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2013-01-23 17:02:23 +0000 |
| commit | bb223216ef313923f7c80c603f8c3170b99e7d2d (patch) | |
| tree | 7f2a4548bb699d18331e3751cfdd87bcfb103e43 | |
| parent | 4e08b046b705bbb40cf102a02454020c6859b975 (diff) | |
| download | pkgsrc-bb223216ef313923f7c80c603f8c3170b99e7d2d.tar.gz | |
X11 (from the Xquartz distribution) gets installed under "/opt/X11" under
Mac OS X Mountain Lion. "/usr/X11" is only a symbolic link. Use the correct
path because buidlink3 will otherwise filter out "-I/opt/X11/include" which
causes build failures of e.g. the "cairo" package.
| -rw-r--r-- | mk/bsd.prefs.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 26e60469c2b..af49effce5b 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.329 2012/12/15 21:21:27 markd Exp $ +# $NetBSD: bsd.prefs.mk,v 1.330 2013/01/23 17:02:23 tron Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -553,8 +553,11 @@ X11BASE?= /usr/openwin . elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" X11BASE?= /usr . elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ - !empty(MACHINE_PLATFORM:MDarwin-??.*-*) + !empty(MACHINE_PLATFORM:MDarwin-10.*-*) || \ + !empty(MACHINE_PLATFORM:MDarwin-11.*-*) X11BASE?= /usr/X11 +. elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) +X11BASE?= /opt/X11 . elif ${OPSYS} == "NetBSD" && ${X11FLAVOUR:U} == "Xorg" X11BASE?= /usr/X11R7 . elif exists(/usr/X11R7/lib/libX11.so) |