[src/trunk]: src/external/mit/xorg update for xbitmaps 1.1.0. black6/box6 ha...

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

details:   https://anonhg.NetBSD.org/src/rev/225311283e9a
branches:  trunk
changeset: 748875:225311283e9a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Nov 09 00:41:25 2009 +0000

description:
update for xbitmaps 1.1.0.  black6/box6 have moved into here, so don't
install them from xmh any more.

diffstat:

 external/mit/xorg/bin/xmh/Makefile          |  5 +----
 external/mit/xorg/include/xbitmaps/Makefile |  5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r ae3cfccdf536 -r 225311283e9a external/mit/xorg/bin/xmh/Makefile
--- a/external/mit/xorg/bin/xmh/Makefile        Mon Nov 09 00:36:22 2009 +0000
+++ b/external/mit/xorg/bin/xmh/Makefile        Mon Nov 09 00:41:25 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2009/11/09 00:41:25 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,9 +11,6 @@
 CPPFLAGS+=     -DHAS_VFORK -DXVENDORNAME=${XVENDORNAME} \
                -DXORG_RELEASE=${XORG_RELEASE}
 
-FILES= black6 box6
-FILESDIR=${X11INCDIR}/X11/bitmaps
-
 APPDEFS=Xmh.ad
 
 LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
diff -r ae3cfccdf536 -r 225311283e9a external/mit/xorg/include/xbitmaps/Makefile
--- a/external/mit/xorg/include/xbitmaps/Makefile       Mon Nov 09 00:36:22 2009 +0000
+++ b/external/mit/xorg/include/xbitmaps/Makefile       Mon Nov 09 00:41:25 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2009/11/09 00:41:26 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,8 @@
        right_ptr right_ptrmsk root_weave scales sipb star starMask \
        stipple target terminal tie_fighter vlines2 vlines3 weird_size \
        wide_weave wingdogs woman xfd_icon xlogo11 xlogo16 xlogo32 \
-       xlogo64 xsnow
+       xlogo64 xsnow \
+       box6 black6
 
 PKGCONFIG=     xbitmaps