From d1f6c823234c11bd2e7a1f9f38b6d784611d1f22 Mon Sep 17 00:00:00 2001 From: abs Date: Sun, 18 Sep 2011 12:42:23 +0000 Subject: switch NetBSD-4 and AIX to default to modular X11_TYPE --- mk/platform/AIX.mk | 4 +--- mk/platform/NetBSD.mk | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'mk/platform') diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk index 13e75f57c27..99b69972a81 100644 --- a/mk/platform/AIX.mk +++ b/mk/platform/AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: AIX.mk,v 1.36 2011/09/10 16:30:02 abs Exp $ +# $NetBSD: AIX.mk,v 1.37 2011/09/18 12:42:23 abs Exp $ # # Variable definitions for the AIX operating system. @@ -29,8 +29,6 @@ ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` -X11_TYPE?= native - # imake installs manpages in weird places # these values from /usr/X11R6/lib/X11/config/NetBSD.cf IMAKE_MAN_SOURCE_PATH= man/cat diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk index 4d459ab6e04..53353df0b44 100644 --- a/mk/platform/NetBSD.mk +++ b/mk/platform/NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.mk,v 1.34 2011/09/10 16:30:02 abs Exp $ +# $NetBSD: NetBSD.mk,v 1.35 2011/09/18 12:42:23 abs Exp $ # # Variable definitions for the NetBSD operating system. @@ -42,7 +42,7 @@ ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` # native is only supported on NetBSD-4 and later. Need to confirm NetBSD-4. -.if empty(MACHINE_PLATFORM:MNetBSD-[0-3].*) +.if empty(MACHINE_PLATFORM:MNetBSD-[0-4].*) X11_TYPE?= native .endif -- cgit v1.2.3