Move MOTIF_TYPE_DEFAULT and MOTIF12_TYPE_DEFAULT definitions into the

individual defs.${OPSYS}.mk files. No change in functionality.

5 files changed, 13 insertions, 24 deletions

diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index a6491363f2d..a3e9bee994b 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.11 2001/11/21 13:44:44 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.12 2001/11/21 13:54:14 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -53,6 +53,8 @@ XARGS?=		/usr/bin/xargs
 
 DEF_UMASK?=	0022
 GROUPADD?=	${FALSE}			# XXX - Fix me!
+MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
+MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=	${FALSE}
 USERADD?=	${FALSE}			# XXX - Fix me!
 
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index aa9db8490f3..d39afbaaa5b 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.17 2001/11/21 13:44:44 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.18 2001/11/21 13:54:14 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -57,6 +57,8 @@ XARGS?=		/usr/bin/xargs -r
 
 DEF_UMASK?=	022
 GROUPADD?=	/usr/sbin/groupadd
+MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
+MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=	${FALSE}
 USERADD?=	/usr/sbin/useradd
 
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 8c2f192414f..3999243fcf2 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.15 2001/11/21 13:44:44 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.16 2001/11/21 13:54:14 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -63,6 +63,8 @@ DEPENDS+=	user>=20000313:../../sysutils/user
 .endif
 
 DEF_UMASK?=	0022
+MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
+MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=	/sbin/nologin
 
 ROOT_USER?=	root
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 3762a3f6e70..ef0d8ec498c 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.14 2001/11/21 13:44:44 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.15 2001/11/21 13:54:14 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -64,6 +64,8 @@ XARGS?=		/usr/bin/xargs
 
 DEF_UMASK?=	022
 GROUPADD?=	/usr/sbin/groupadd
+MOTIF_TYPE_DEFAULT?=	dt		# default 2.0 compatible libs type
+MOTIF12_TYPE_DEFAULT?=	dt		# default 1.2 compatible libs type
 NOLOGIN?=	${FALSE}
 USERADD?=	/usr/sbin/useradd
 
diff --git a/mk/motif.buildlink.mk b/mk/motif.buildlink.mk
index c9fd004a6ab..bbd38d013f3 100644
--- a/mk/motif.buildlink.mk
+++ b/mk/motif.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: motif.buildlink.mk,v 1.10 2001/09/21 19:26:45 jlam Exp $
+# $NetBSD: motif.buildlink.mk,v 1.11 2001/11/21 13:54:14 agc Exp $
 #
 # This Makefile fragment is included by packages that use Motif.
 #
@@ -17,25 +17,6 @@ MOTIF_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-# Default to using OpenMotif for Motif-2.0-compatible libraries as it's a
-# "real" Motif with full functionality.  On Solaris, default to DT-Motif
-# (in /usr/dt).
-#
-.if ${OPSYS} == "SunOS"
-MOTIF_TYPE_DEFAULT?=	dt
-.else
-MOTIF_TYPE_DEFAULT?=	openmotif
-.endif
-
-# Default to using LessTif for Motif-1.2-compatible libraries.  On Solaris,
-# default to DT-Motif (in /usr/dt).
-#
-.if ${OPSYS} == "SunOS"
-MOTIF12_TYPE_DEFAULT?=	dt
-.else
-MOTIF12_TYPE_DEFAULT?=	lesstif12
-.endif
-
 .if defined(USE_MOTIF12)
 #
 # If /usr/dt is a valid Motif-1.2 installation, then use it.  Otherwise,