Re: xsrc/50002: X11 broken by X11 compat

[Martin Husemann <martin%duskware.de@localhost>]

The following reply was made to PR xsrc/50002; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: matt%NetBSD.org@localhost
Subject: Re: xsrc/50002: X11 broken by X11 compat
Date: Sun, 28 Jun 2015 10:58:15 +0200

 Is this the correct patch to fix it?
 
 Martin
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile
 --- Makefile	24 Aug 2014 18:27:16 -0000	1.12
 +++ Makefile	28 Jun 2015 08:56:21 -0000
 @@ -2,8 +2,11 @@
  
  .include <bsd.own.mk>
  
 -SUBDIR=		dynamic .WAIT libX11-xcb static \
 -		ximcp xlcDef xlcUTF8Load xlibi18n xlocale xomGeneric
 +SUBDIR=		dynamic .WAIT libX11-xcb static
 +
 +.if !defined(MLIBDIR)
 +SUBDIR+=	ximcp xlcDef xlcUTF8Load xlibi18n xlocale xomGeneric
 +.endif
  
  INCS=		ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
  		Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \