Remove Motif 1.2 functionality.

13 files changed, 29 insertions, 119 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 74196900456..c1f0555fdaa 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.249 2004/06/06 22:04:55 minskim Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.250 2004/06/18 11:22:41 kristerw Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -166,12 +166,6 @@ VARBASE?=	/var
 # Possible: any path
 # Default: ${X11PREFIX} or where openmotif or lesstif is installed
 
-#MOTIF12BASE?=	/usr/X11R6
-# Where Motif-1.2-compatible headers and libraries are installed
-# on the system.
-# Possible: any path
-# Default: ${X11PREFIX} or where lesstif12 is installed
-
 USE_XPKGWEDGE?=	yes
 # Whether we should use xpkgwedge or not to install all packages into
 # ${LOCALBASE}.
@@ -1536,21 +1530,6 @@ MPLAYER_USE_MEDIALIB?= NO
 # Possible:  openmotif, lesstif, dt (Irix and Solaris only)
 # Default: openmotif, or dt (Irix and Solaris only)
 
-#MOTIF12_TYPE?=	lesstif12
-# Used by motif.buildlink2.mk to choose which Motif-1.2-compatible
-# installation to use.  This value is also automatically set by
-# motif.buildlink2.mk to whichever Motif-1.2 installation represented by
-# the possible values below is already installed, but defaults to
-# ${MOTIF12_TYPE_DEFAULT}.  This value is ignored if MOTIF12BASE is
-# explicitly set.
-# Possible: lesstif12, dt (Irix and Solaris only)
-# Default: ${MOTIF12_TYPE_DEFAULT}
-
-#MOTIF12_TYPE_DEFAULT?=	lesstif12
-# Used by motif.buildlink2.mk as the final default value for MOTIF12_TYPE.
-# Possible:  lesstif12, dt (Irix and Solaris only)
-# Default: lesstif12, or dt (Irix and Solaris only)
-
 #MPG123_ARM_FIXED64=YES
 # Used by mpg123 and mpg123-esound to enable ARM to use 64bit fixedpoint
 # Possible: not defined, YES
diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk
index 04c405a6c60..9be9822bc76 100644
--- a/mk/defs.AIX.mk
+++ b/mk/defs.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.10 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.AIX.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -122,7 +122,6 @@ CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		/sbin/nologin
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk
index 8354fefd662..1e7240c6166 100644
--- a/mk/defs.BSDOS.mk
+++ b/mk/defs.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.10 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -106,7 +106,6 @@ EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
 .endif
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		/sbin/nologin
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index dba8e3364e9..eacebe931c4 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.76 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.Darwin.mk,v 1.77 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -89,7 +89,6 @@ DEF_UMASK?=		0022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		${FALSE}
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		sudo sh -c
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 122ea8db8c2..7823f274323 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.41 2004/06/03 22:07:35 xtraeme Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.42 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -106,7 +106,6 @@ EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
 .endif
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		/sbin/nologin
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 221f865011c..f636015457e 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.52 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.53 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -97,7 +97,6 @@ DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
 GROUPADD?=		${FALSE}
 MOTIF_TYPE_DEFAULT?=	dt		# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	dt		# default 1.2 compatible libs type
 NOLOGIN?=		${FALSE}
 ROOT_CMD?=		${SU} - root -c
 ROOT_GROUP?=		sys
diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk
index b7915da45b5..5ad908aec79 100644
--- a/mk/defs.Interix.mk
+++ b/mk/defs.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Interix.mk,v 1.24 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.Interix.mk,v 1.25 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -92,7 +92,6 @@ DEF_UMASK?=		002
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		/bin/false
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 PKGDIRMODE?=		775
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 5345488a534..6cdfe3c0f29 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.72 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.Linux.mk,v 1.73 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -139,7 +139,6 @@ DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
 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}
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index f6bd81e28f7..10bd9eb089a 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.67 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.68 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -99,7 +99,6 @@ EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
 .endif
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		/sbin/nologin
 .if exists(${LOCALBASE}/sbin/pkg_info)
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index a31dac5d85d..b2269ba7032 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.34 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.35 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -97,7 +97,6 @@ EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
 .endif
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		/sbin/nologin
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 1c40a5a5523..8fbd3c6086a 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.86 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.SunOS.mk,v 1.87 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -96,7 +96,6 @@ DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
 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}
 ROOT_CMD?=		${SU} - root -c
 ROOT_GROUP?=		root
diff --git a/mk/defs.UnixWare.mk b/mk/defs.UnixWare.mk
index 05e9cf4eab8..82882b16a18 100644
--- a/mk/defs.UnixWare.mk
+++ b/mk/defs.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.UnixWare.mk,v 1.4 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.UnixWare.mk,v 1.5 2004/06/18 11:22:41 kristerw Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -92,7 +92,6 @@ DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
 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}
 ROOT_CMD?=		${SU} - root -c
 ROOT_GROUP?=		root
diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk
index b425c0895c1..8959c7740bd 100644
--- a/mk/motif.buildlink3.mk
+++ b/mk/motif.buildlink3.mk
@@ -1,110 +1,62 @@
-# $NetBSD: motif.buildlink3.mk,v 1.3 2004/06/14 01:18:16 grant Exp $
+# $NetBSD: motif.buildlink3.mk,v 1.4 2004/06/18 11:22:41 kristerw Exp $
 #
-# USE_MOTIF12
-#	use a Motif-1.2-compatible installation, otherwise, assume
-#	we want a Motif-2.0-compatible installation
+# MOTIFBASE
+#	choose the Motif-2.0 installation at the named location.
 #
-# MOTIFBASE, MOTIF12BASE
-#	choose the Motif-2.0 or Motif-1.2-compatible installation at the
-#	named location
-#
-# MOTIF_TYPE, MOTIF12_TYPE
-#	choose a specific Motif-2.0 or Motif-1.2-compatible package.
+# MOTIF_TYPE
+#	choose a specific Motif-2.0 package.
 
 .if !defined(MOTIF_BUILDLINK3_MK)
 MOTIF_BUILDLINK3_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_MOTIF12)
-#
-# If /usr/dt is a valid Motif-1.2 installation, then use it.  Otherwise,
-# if ${X11BASE} is valid, then use it.  Otherwise, use the Motif-1.2
-# specified by ${MOTIF12_TYPE_DEFAULT}.
-#
-.  if exists(/usr/dt/include/Xm/Xm.h) && \
-      !exists(/usr/dt/include/Xm/Gadget.h)
-_MOTIF_TYPE=		dt
-.  elif exists(${X11BASE}/include/Xm/Xm.h) && \
-	!exists(${X11BASE}/include/Xm/Gadget.h)
-_MOTIF_TYPE=		none
-.  else
-_MOTIF_TYPE=		${MOTIF12_TYPE_DEFAULT}
-.  endif
-.else
 #
 # If /usr/dt is a valid Motif-2.0 installation, then use it.  Otherwise,
 # check to see if a pkgsrc Motif-2.0 is installed and valid, then use it.
 # Otherwise, if ${X11BASE} is valid, then use it.  Otherwise, use the
 # Motif-2.0 specified by ${MOTIF_TYPE_DEFAULT}.
 #
-.  if exists(/usr/dt/include/Xm/Xm.h) && \
+.if exists(/usr/dt/include/Xm/Xm.h) && \
       exists(/usr/dt/include/Xm/Gadget.h)
 _MOTIF_TYPE=		dt
-.  elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \
+.elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \
 	exists(${LOCALBASE}/lib/X11/config/OpenMotif.tmpl)
 _MOTIF_TYPE=		openmotif
-.  elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \
+.elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \
 	exists(${LOCALBASE}/lib/X11/config/LessTif.tmpl)
 _MOTIF_TYPE=		lesstif
-.  elif exists(${X11BASE}/include/Xm.h) && \
+.elif exists(${X11BASE}/include/Xm.h) && \
 	exists(${X11BASE}/include/Xm/Gadget.h)
 _MOTIF_TYPE=		none
-.  else
+.else
 _MOTIF_TYPE=		${MOTIF_TYPE_DEFAULT}
-.  endif
 .endif
 
 # If MOTIF_TYPE is set, then let that override the Motif-discovery just
 # performed.  We only recognize the tested strings as proper values for
 # MOTIF_TYPE.
 #
-.if defined(USE_MOTIF12)
-.  if defined(MOTIF12_TYPE)
-.    if (${MOTIF12_TYPE} == "dt") || \
-	(${MOTIF12_TYPE} == "lesstif12")
-_MOTIF_TYPE=		${MOTIF12_TYPE}
-.    endif
-.  endif
-.else
-.  if defined(MOTIF_TYPE)
-.    if (${MOTIF_TYPE} == "dt") || \
+.if defined(MOTIF_TYPE)
+.  if (${MOTIF_TYPE} == "dt") || \
 	(${MOTIF_TYPE} == "lesstif") || \
 	(${MOTIF_TYPE} == "openmotif")
 _MOTIF_TYPE=		${MOTIF_TYPE}
-.    endif
 .  endif
 .endif
 
-.if defined(USE_MOTIF12)
-#
-# If MOTIF12BASE is set, then let that override all other Motif-1.2
-# discovery just performed.
-#
-.  if defined(MOTIF12BASE)
-_MOTIF_TYPE=		none
-_MOTIFBASE=		${MOTIF12BASE}
-.  else
-.    if ${_MOTIF_TYPE} == "dt"
-_MOTIFBASE=		/usr/dt
-.    elif ${_MOTIF_TYPE} == "none"
-_MOTIFBASE=		${X11BASE}
-.    endif
-.  endif
-.else
 #
 # If MOTIFBASE is set, then let that override all other Motif-2.0
 # discovery just performed.
 #
-.  if defined(MOTIFBASE)
+.if defined(MOTIFBASE)
 _MOTIF_TYPE=		none
 _MOTIFBASE=		${MOTIFBASE}
-.  else
-.    if ${_MOTIF_TYPE} == "dt"
+.else
+.  if ${_MOTIF_TYPE} == "dt"
 _MOTIFBASE=		/usr/dt
-.    elif ${_MOTIF_TYPE} == "none"
+.  elif ${_MOTIF_TYPE} == "none"
 _MOTIFBASE=		${X11BASE}
-.    endif
 .  endif
 .endif
 
@@ -114,9 +66,6 @@ _MOTIFBASE=		${BUILDLINK_PREFIX.openmotif}
 .elif ${_MOTIF_TYPE} == "lesstif"
 .  include "../../x11/lesstif/buildlink3.mk"
 _MOTIFBASE=		${BUILDLINK_PREFIX.lesstif}
-.elif ${_MOTIF_TYPE} == "lesstif12"
-.  include "../../x11/lesstif12/buildlink3.mk"
-_MOTIFBASE=		${BUILDLINK_PREFIX.lesstif12}
 .else
 #
 # Link the pre-existing Motif libraries and headers in ${_MOTIFBASE} into
@@ -125,16 +74,9 @@ _MOTIFBASE=		${BUILDLINK_PREFIX.lesstif12}
 BUILDLINK_PREFIX.motif=	${_MOTIFBASE}
 .endif
 
-.if defined(USE_MOTIF12)
-.  if !defined(MOTIF12BASE)
-MOTIF12_TYPE:=		${_MOTIF_TYPE}
-MOTIF12BASE=		${_MOTIFBASE}
-.  endif
-.else
-.  if !defined(MOTIFBASE)
+.if !defined(MOTIFBASE)
 MOTIF_TYPE:=		${_MOTIF_TYPE}
 MOTIFBASE=		${_MOTIFBASE}
-.  endif
 .endif
 
 USE_X11?=		# defined