[src/trunk]: src New variable MKX11MOTIF to enable building libGLw with Motif...

[mbalmer <mbalmer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/73bbdaa75258
branches:  trunk
changeset: 787104:73bbdaa75258
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sun Jun 02 11:02:40 2013 +0000

description:
New variable MKX11MOTIF to enable building libGLw with Motif support.
Defaults to 'no'.

diffstat:

 external/mit/xorg/lib/libGLw/Makefile |  12 +++++++++++-
 share/man/man5/mk.conf.5              |  11 +++++++++--
 share/mk/bsd.README                   |   8 +++++++-
 share/mk/bsd.own.mk                   |   4 ++--
 4 files changed, 29 insertions(+), 6 deletions(-)

diffs (98 lines):

diff -r 40f18451b308 -r 73bbdaa75258 external/mit/xorg/lib/libGLw/Makefile
--- a/external/mit/xorg/lib/libGLw/Makefile     Sun Jun 02 09:45:04 2013 +0000
+++ b/external/mit/xorg/lib/libGLw/Makefile     Sun Jun 02 11:02:40 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2013/06/02 11:02:40 mbalmer Exp $
 
 .include <bsd.own.mk>
 
@@ -9,6 +9,16 @@
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
 
+# Motif stubs for glwMDrawingAreaClass are enabled by setting MKX11MOTIF
+# in /etc/mk.conf.  If Motif is not installed in the default location
+# (/usr/pkg), set X11MOTIFPATH as well.
+
+.if "${MKX11MOTIF}" == "yes"
+X11MOTIFPATH?= /usr/pkg
+SRCS+=         GLwMDrawA.c
+CPPFLAGS+=     -I${X11MOTIFPATH}/include
+.endif
+
 LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
                X11     ${.CURDIR}/../libX11/dynamic \
                Xxf86vm ${.CURDIR}/../libXxf86vm \
diff -r 40f18451b308 -r 73bbdaa75258 share/man/man5/mk.conf.5
--- a/share/man/man5/mk.conf.5  Sun Jun 02 09:45:04 2013 +0000
+++ b/share/man/man5/mk.conf.5  Sun Jun 02 11:02:40 2013 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: mk.conf.5,v 1.66 2013/02/15 21:03:17 wiz Exp $
+.\"    $NetBSD: mk.conf.5,v 1.67 2013/06/02 11:02:40 mbalmer Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 15, 2013
+.Dd June 2, 2013
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -821,6 +821,13 @@
 do not build and install the X fonts.
 .DFLTy
 .
+.It Sy MKX11MOTIF
+.YorN
+If
+.Dq yes ,
+build the native Xorg libGLw with Motif stubs.
+.DFLTn
+.
 .It Sy MKYP
 .YorN
 Indicates whether the YP (NIS) infrastructure
diff -r 40f18451b308 -r 73bbdaa75258 share/mk/bsd.README
--- a/share/mk/bsd.README       Sun Jun 02 09:45:04 2013 +0000
+++ b/share/mk/bsd.README       Sun Jun 02 11:02:40 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.317 2013/05/31 06:48:43 mrg Exp $
+#      $NetBSD: bsd.README,v 1.318 2013/06/02 11:02:40 mbalmer Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -391,6 +391,12 @@
                will be empty.
                Default: yes
 
+MKX11MOTIF:    If "yes" and ${X11FLAVOUR} is "Xorg", build the native X11
+               libGLw with Motif stubs.  If Motif is not installed in the
+               default location /usr/pkg, the location can be specified
+               using the X11MOTIFPATH variable.
+               Default: no
+
 MKYP           If "no", disables building of YP (NIS)
                infrastructure (libraries and support programs).
                Default: yes
diff -r 40f18451b308 -r 73bbdaa75258 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Jun 02 09:45:04 2013 +0000
+++ b/share/mk/bsd.own.mk       Sun Jun 02 11:02:40 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.730 2013/05/03 16:05:11 matt Exp $
+#      $NetBSD: bsd.own.mk,v 1.731 2013/06/02 11:02:40 mbalmer Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -898,7 +898,7 @@
        MKPIGZGZIP \
        MKREPRO \
        MKSOFTFLOAT MKSTRIPIDENT MKTPM \
-       MKUNPRIVED MKUPDATE MKX11 MKZFS
+       MKUNPRIVED MKUPDATE MKX11 MKX11MOTIF MKZFS
 .for var in ${_MKVARS.no}
 ${var}?=no
 .endfor