summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk4
-rw-r--r--mk/platform/AIX.mk4
-rw-r--r--mk/platform/BSDOS.mk4
-rw-r--r--mk/platform/Darwin.mk6
-rw-r--r--mk/platform/DragonFly.mk5
-rw-r--r--mk/platform/HPUX.mk7
-rw-r--r--mk/platform/Haiku.mk5
-rw-r--r--mk/platform/IRIX.mk4
-rw-r--r--mk/platform/Interix.mk4
-rw-r--r--mk/platform/MirBSD.mk4
-rw-r--r--mk/platform/NetBSD.mk7
-rw-r--r--mk/platform/OSF1.mk7
-rw-r--r--mk/platform/OpenBSD.mk4
-rw-r--r--mk/platform/SunOS.mk4
-rw-r--r--mk/platform/UnixWare.mk4
15 files changed, 39 insertions, 34 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 0159f7521c8..973eab3a6d7 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.315 2011/09/08 20:17:15 abs Exp $
+# $NetBSD: bsd.prefs.mk,v 1.316 2011/09/10 16:30:02 abs Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -539,7 +539,7 @@ IPV6_READY= NO
.endif
LOCALBASE?= /usr/pkg
-X11_TYPE?= native
+X11_TYPE?= modular
.if !empty(X11_TYPE:Mnative)
. if ${OPSYS} == "SunOS"
# On Solaris, we default to using OpenWindows for X11.
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index bb46f64f755..13e75f57c27 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.35 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: AIX.mk,v 1.36 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the AIX operating system.
@@ -29,6 +29,8 @@ 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/BSDOS.mk b/mk/platform/BSDOS.mk
index 2b6dbabf3f5..a0d949b192c 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.28 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: BSDOS.mk,v 1.29 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -34,6 +34,8 @@ 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
# XXX: assume NetBSD defaults until somebody determines correct values
IMAKE_MAN_SOURCE_PATH= man/cat
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 426292201ad..ea1881f394c 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.46 2011/09/09 09:31:56 yyamano Exp $
+# $NetBSD: Darwin.mk,v 1.47 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the Darwin operating system.
@@ -16,8 +16,8 @@
# Lion 10.7.x 11.x.y 4.1 (llvm gcc 4.2.1)
# Tiger (and earlier) use Xfree 4.4.0 (and earlier)
-.if ! empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-X11_TYPE?=modular
+.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+X11_TYPE?= native
.endif
.if !defined(CPP) || ${CPP} == "cpp"
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index edca4dfdbcc..7162ec917b6 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.39 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: DragonFly.mk,v 1.40 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the DragonFly operating system.
@@ -24,9 +24,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`
-# DragonFly does not provide an X11, so default to modular X.org
-X11_TYPE?= modular
-
# imake installs manpages in weird places
IMAKE_MAN_SOURCE_PATH= man/man
IMAKE_MAN_SUFFIX= 1
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index e3abcc0fcb7..7fc489b1901 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.18 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: HPUX.mk,v 1.19 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the HP-UX operating system.
@@ -26,11 +26,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`
-# native X11 on HP-UX is rather old and breaks many packages.
-# The modular X.org userland works rather well, apart from the server which
-# is unlikely to ever be supported due to proprietary graphics hardware.
-X11_TYPE?= modular
-
# Fix broken system headers by using pkgtools/posix_headers
FIX_SYSTEM_HEADERS?= yes
diff --git a/mk/platform/Haiku.mk b/mk/platform/Haiku.mk
index acd32094550..231f81d6abe 100644
--- a/mk/platform/Haiku.mk
+++ b/mk/platform/Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Haiku.mk,v 1.4 2010/08/16 10:03:44 obache Exp $
+# $NetBSD: Haiku.mk,v 1.5 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the Haiku operating system.
@@ -31,9 +31,6 @@ ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
USERADD?= /bin/useradd
-# no native X11
-X11_TYPE?= modular
-
# imake installs manpages in weird places
# these values from /boot/common/X11/lib/X11/config/Haiku.cf
#IMAKE_MAN_SOURCE_PATH= man/man
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 11f7bc45905..f9bb91b2ae7 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.37 2011/05/07 22:16:16 cheusov Exp $
+# $NetBSD: IRIX.mk,v 1.38 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the IRIX operating system.
@@ -35,6 +35,8 @@ GROUPADD?= ${LOCALBASE}/sbin/groupadd
_PKG_USER_HOME?= /dev/null # to match other system accounts
_USER_DEPENDS= user-[0-9]*:../../sysutils/user_irix
+X11_TYPE?= native
+
# imake installs manpages in weird places
.if !empty(OS_VERSION:M6*)
IMAKE_MAN_SOURCE_PATH?= catman/u_man/cat
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 07289c068a9..c2309ef38b1 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.64 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: Interix.mk,v 1.65 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the Interix operating system.
@@ -105,6 +105,8 @@ ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v`
+X11_TYPE?= native
+
# imake installs manpages in weird places
IMAKE_MAN_SOURCE_PATH= man/man
IMAKE_MAN_SUFFIX= n
diff --git a/mk/platform/MirBSD.mk b/mk/platform/MirBSD.mk
index a61669b3d91..8775a044a28 100644
--- a/mk/platform/MirBSD.mk
+++ b/mk/platform/MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: MirBSD.mk,v 1.2 2011/03/19 14:07:10 dholland Exp $
+# $NetBSD: MirBSD.mk,v 1.3 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the MirOS BSD operating system.
@@ -27,6 +27,8 @@ 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/OpenBSD.cf
# XXX verify against MirBSD.cf defns
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 414ca5ca8df..4d459ab6e04 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.33 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: NetBSD.mk,v 1.34 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -41,6 +41,11 @@ ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
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].*)
+X11_TYPE?= native
+.endif
+
# 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/OSF1.mk b/mk/platform/OSF1.mk
index 9ae12fba797..70f5a735b77 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.30 2009/12/19 10:53:33 tnn Exp $
+# $NetBSD: OSF1.mk,v 1.31 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the OSF1 operating system.
@@ -42,11 +42,6 @@ IMAKE_MANINSTALL?= maninstall catinstall
# Fix broken system headers by using pkgtools/posix_headers
FIX_SYSTEM_HEADERS?= yes
-# native X11 on Tru64 is rather old and breaks many packages.
-# The modular X.org userland works rather well, apart from the server which
-# is unlikely to ever be supported due to proprietary graphics hardware.
-X11_TYPE?= modular
-
_OPSYS_EMULDIR.osf1= # empty
.if exists(/usr/include/netinet/ip6.h)
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 5e22a04fe0d..ca9e2625830 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.30 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: OpenBSD.mk,v 1.31 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -33,6 +33,8 @@ 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/OpenBSD.cf
IMAKE_MAN_SOURCE_PATH= man/cat
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 4ec7028651a..1e189cf26cb 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.39 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: SunOS.mk,v 1.40 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -27,6 +27,8 @@ ULIMIT_CMD_stacksize?= ulimit -s `${SETENV} LC_MESSAGES=C ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -v `${SETENV} LC_MESSAGES=C ulimit -H -v`
USERADD?= /usr/sbin/useradd
+X11_TYPE?= native
+
# imake installs manpages in weird places
.if !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
# openwindows
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 27439a77049..75696baa4ae 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.29 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: UnixWare.mk,v 1.30 2011/09/10 16:30:02 abs Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -27,6 +27,8 @@ ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v`
USERADD?= /usr/sbin/useradd
+X11_TYPE?= native
+
# imake installs manpages in weird places
IMAKE_MAN_SOURCE_PATH= share/man/man
IMAKE_MAN_SUFFIX= 1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 04:24:12 +0000