diff options
| author | tron <tron> | 2009-09-13 13:28:46 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-09-13 13:28:46 +0000 |
| commit | 87673b9066b32e1853044c70c9d10267f99617a8 (patch) | |
| tree | 1a777d5059ce7b4fdb086fa7e8f074813747791f /mk | |
| parent | e3a4079259be9b1cf333c38c6a58722967c05a31 (diff) | |
| download | pkgsrc-87673b9066b32e1853044c70c9d10267f99617a8.tar.gz | |
Add support for X.org bundled with Mac OS X Snow Leopard.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 5 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ecef995076e..5b44dde08b7 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.294 2009/05/23 23:48:44 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.295 2009/09/13 13:28:46 tron Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -501,7 +501,8 @@ X11_TYPE?= native X11BASE?= /usr/openwin . elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" X11BASE?= /usr -. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) +. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ + !empty(MACHINE_PLATFORM:MDarwin-??.*-*) X11BASE?= /usr/X11 . elif exists(/usr/X11R7/lib/libX11.so) X11BASE?= /usr/X11R7 diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 6999d267467..9dfc783c483 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.185 2009/08/05 22:14:28 minskim Exp $ +# $NetBSD: mk.conf,v 1.186 2009/09/13 13:28:46 tron Exp $ # # This file provides default values for variables that may be overridden @@ -206,12 +206,15 @@ PKGSRC_RUN_TEST?= no .if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ exists(/usr/X11R7/lib/libX11.so)) PREFER_PKGSRC?= -.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ - (defined(X11_TYPE) && ${X11_TYPE} != "native") +.elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \ + (!defined(X11_TYPE) || ${X11_TYPE} == "native") +PREFER_PKGSRC?= +.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \ + (!defined(X11_TYPE) || ${X11_TYPE} == "native") +PREFER_PKGSRC?= fontconfig pixman Xft2 +.else PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ freetype2 glu randrproto renderproto xcursor -.else -PREFER_PKGSRC?= fontconfig pixman Xft2 .endif PREFER_NATIVE?= yes # |