summaryrefslogtreecommitdiff
path: root/mk/platform
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2014-09-02 16:13:27 +0000
committergdt <gdt@pkgsrc.org>2014-09-02 16:13:27 +0000
commit6d942ceff2a3f3f1c6e19c488bc97550df6de68b (patch)
tree1be931949884cfb0c3862889ccce3ea888dc1604 /mk/platform
parent7b46518e8e13c17a3b313e871215e4a93b5ec347 (diff)
downloadpkgsrc-6d942ceff2a3f3f1c6e19c488bc97550df6de68b.tar.gz
Default to X11_TYPE=modular on netbsd-5.
Base xsrc on netbsd-5 has not really worked with pkgsrc for a while, because various programs need newer versions of various X pieces. The 2014Q2 official bulk builds are missing about 1500 packages as a result of this. Therefore, switch to modular on netbsd-5 (as netbsd-4 has been for a very long time), which should result in more useful binary packages for netbsd-5 for 2014Q3. (There is a notion of updating netbsd-5 base xsrc to more modern xorg. If that happens, and there's a 5.x formal release, and builds show that pkgsrc with native succeeds on it, this can perhaps be flipped back. Odds are that's not going to happen, and it's overwhelmingly unlikely to happen soon.) Anyone who prefers to stay with native can set X11_TYPE=native in mk.conf. Note that this is about pkgsrc and specifically the default dependencies for pkgsrc programs that use X11, so the native servers are unaffected and can be run from /usr/X11R7, the same as they are now, without any changes being necessary. (This message is in fact being typed on a system with a native server, native xterm and modular libs for pkgsrc.) Discussed on tech-pkg, tech-x11 multiple times over the last 6 months or so, and specifically encouraged by wiz@.
Diffstat (limited to 'mk/platform')
-rw-r--r--mk/platform/NetBSD.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index e6c02cfa0a7..91940de5abb 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.39 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: NetBSD.mk,v 1.40 2014/09/02 16:13:27 gdt Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -42,7 +42,9 @@ ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
# Native X11 is only supported on NetBSD-5 and later.
-.if empty(MACHINE_PLATFORM:MNetBSD-[0-4].*)
+# On NetBSD-5, native X11 has enough issues that we default
+# to modular.
+.if empty(MACHINE_PLATFORM:MNetBSD-[0-5].*)
X11_TYPE?= native
.endif