diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2011-11-28 00:00:49 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2011-11-28 00:00:49 +0000 |
| commit | 57f467b42b1454e0f1acaf9c0d5068b536ba3131 (patch) | |
| tree | 03e13f2095b6ddd29b9b5fe86b2ec931818ae8ef /mk/bsd.prefs.mk | |
| parent | cd8ac023ccbcbc60d339ea01f1ff8082090f5086 (diff) | |
| download | pkgsrc-57f467b42b1454e0f1acaf9c0d5068b536ba3131.tar.gz | |
for X11_TYPE=native, default X11BASE to /usr/X11R7 on NetBSD if
X11FLAVOUR is "Xorg", so it is set right even when x* sets aren't installed
ok joerg
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 e0c37b7bd36..ac4d3b0a64e 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.318 2011/10/26 16:01:14 hans Exp $ +# $NetBSD: bsd.prefs.mk,v 1.319 2011/11/28 00:00:49 jmcneill Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -549,6 +549,8 @@ X11BASE?= /usr . elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ !empty(MACHINE_PLATFORM:MDarwin-??.*-*) X11BASE?= /usr/X11 +. elif ${OPSYS} == "NetBSD" && ${X11FLAVOUR:U} == "Xorg" +X11BASE?= /usr/X11R7 . elif exists(/usr/X11R7/lib/libX11.so) X11BASE?= /usr/X11R7 . else |