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/bsd.prefs.mk | |
| 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/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index e6add2cc6c9..d2983084e9c 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.287 2008/09/16 11:40:10 tron Exp $ +# $NetBSD: bsd.prefs.mk,v 1.288 2008/10/05 21:36:34 cube Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -493,6 +493,8 @@ X11BASE?= /usr/openwin X11BASE?= /usr . elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) X11BASE?= /usr/X11 +. elif exists(/usr/X11R7/lib/libX11.so) +X11BASE?= /usr/X11R7 . else X11BASE?= /usr/X11R6 . endif |