Remove Motif 1.2 functionality.

1 files changed, 17 insertions, 75 deletions

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