[pkgsrc/trunk]: pkgsrc/mk Support "motif" in MOTIF_TYPE.

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6921f46cb7f2
branches:  trunk
changeset: 610892:6921f46cb7f2
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Nov 10 17:13:37 2012 +0000

description:
Support "motif" in MOTIF_TYPE.

diffstat:

 mk/defaults/mk.conf    |  10 +++++-----
 mk/motif.buildlink3.mk |   7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r e802fe5dd781 -r 6921f46cb7f2 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sat Nov 10 17:11:40 2012 +0000
+++ b/mk/defaults/mk.conf       Sat Nov 10 17:13:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.216 2012/08/18 16:29:59 chs Exp $
+# $NetBSD: mk.conf,v 1.217 2012/11/10 17:13:37 ryoon Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -277,7 +277,7 @@
 # Where Motif-2.0-compatible headers and libraries are installed
 # on the system.
 # Possible: any path
-# Default: ${X11PREFIX} or where openmotif or lesstif is installed
+# Default: ${X11PREFIX} or where motif, openmotif or lesstif is installed
 
 PKGINFODIR?=   info
 #      The subdirectory of PREFIX that holds the GNU info files and the
@@ -1291,13 +1291,13 @@
 # the possible values below is already installed, but defaults to
 # ${MOTIF_TYPE_DEFAULT}.  This value is ignored if MOTIFBASE is
 # explicitly set.
-# Possible: openmotif, lesstif, dt (Irix and Solaris only)
+# Possible: motif, openmotif, lesstif, dt (Irix and Solaris only)
 # Default: ${MOTIF_TYPE_DEFAULT}
 
 #MOTIF_TYPE_DEFAULT?=  openmotif
 # Used by motif.buildlink3.mk as the final default value for MOTIF_TYPE.
-# Possible:  openmotif, lesstif, dt (Irix and Solaris only)
-# Default: openmotif, or dt (Irix and Solaris only)
+# Possible:  motif, openmotif, lesstif, dt (Irix and Solaris only)
+# Default: motif, openmotif, or dt (Irix and Solaris only)
 
 #MPG123_ARM_FIXED64=YES
 # Used by mpg123 and mpg123-esound to enable ARM to use 64bit fixedpoint
diff -r e802fe5dd781 -r 6921f46cb7f2 mk/motif.buildlink3.mk
--- a/mk/motif.buildlink3.mk    Sat Nov 10 17:11:40 2012 +0000
+++ b/mk/motif.buildlink3.mk    Sat Nov 10 17:13:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: motif.buildlink3.mk,v 1.15 2012/01/12 15:51:14 hans Exp $
+# $NetBSD: motif.buildlink3.mk,v 1.16 2012/11/10 17:13:37 ryoon Exp $
 #
 # Package-settable variables:
 #
@@ -53,6 +53,7 @@
 .if defined(MOTIF_TYPE)
 .  if (${MOTIF_TYPE} == "dt") || \
        (${MOTIF_TYPE} == "lesstif") || \
+       (${MOTIF_TYPE} == "motif") || \
        (${MOTIF_TYPE} == "openmotif")
 _MOTIF_TYPE=           ${MOTIF_TYPE}
 .  endif
@@ -73,7 +74,9 @@
 .  endif
 .endif
 
-.if ${_MOTIF_TYPE} == "openmotif"
+.if ${_MOTIF_TYPE} == "motif"
+.  include "../../x11/motif/buildlink3.mk"
+.elif ${_MOTIF_TYPE} == "openmotif"
 .  include "../../x11/openmotif/buildlink3.mk"
 .elif ${_MOTIF_TYPE} == "lesstif"
 .  include "../../x11/lesstif/buildlink3.mk"