diff options
| author | cube <cube> | 2008-10-05 21:36:32 +0000 |
|---|---|---|
| committer | cube <cube> | 2008-10-05 21:36:32 +0000 |
| commit | 395ccac0dea0e279f89dd7047289900ec53ee66f (patch) | |
| tree | 7e3acb4e1cfd62c69446a0e9e96faf8cfb567d76 /mk/defaults | |
| parent | 598918af08c795c848c99ba9b3af62b864e882f3 (diff) | |
| download | pkgsrc-395ccac0dea0e279f89dd7047289900ec53ee66f.tar.gz | |
Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.
Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).
On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files. It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file. x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
Diffstat (limited to 'mk/defaults')
| -rw-r--r-- | mk/defaults/mk.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index b9d8b7d382d..570ae07efb4 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.176 2008/05/22 20:11:55 joerg Exp $ +# $NetBSD: mk.conf,v 1.177 2008/10/05 21:36:35 cube Exp $ # # This file provides default values for variables that may be overridden @@ -203,8 +203,11 @@ PKGSRC_RUN_TEST?= no # Possible: yes, no # Default: no -.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ - (defined(X11_TYPE) && ${X11_TYPE} != "native") +.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") PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ freetype2 glu randrproto renderproto xcursor .else |