Module Name: src
Committed By: mrg
Date: Mon Nov 9 00:41:26 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xmh: Makefile
src/external/mit/xorg/include/xbitmaps: Makefile
Log Message:
update for xbitmaps 1.1.0. black6/box6 have moved into here, so don't
install them from xmh any more.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xmh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xbitmaps/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmh/Makefile
diff -u src/external/mit/xorg/bin/xmh/Makefile:1.1.1.1 src/external/mit/xorg/bin/xmh/Makefile:1.2
--- src/external/mit/xorg/bin/xmh/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xmh/Makefile Mon Nov 9 00:41:25 2009
@@ -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
Index: src/external/mit/xorg/include/xbitmaps/Makefile
diff -u src/external/mit/xorg/include/xbitmaps/Makefile:1.2 src/external/mit/xorg/include/xbitmaps/Makefile:1.3
--- src/external/mit/xorg/include/xbitmaps/Makefile:1.2 Sat Sep 13 04:32:29 2008
+++ src/external/mit/xorg/include/xbitmaps/Makefile Mon Nov 9 00:41:26 2009
@@ -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
