Module Name: src
Committed By: mrg
Date: Sun Jul 18 10:58:07 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/lib/xcb-util: Makefile
Log Message:
oops, install all the xcb-util headers.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.111 src/distrib/sets/lists/xcomp/mi:1.112
--- src/distrib/sets/lists/xcomp/mi:1.111 Sun Jul 18 07:07:08 2010
+++ src/distrib/sets/lists/xcomp/mi Sun Jul 18 10:58:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.111 2010/07/18 07:07:08 mrg Exp $
+# $NetBSD: mi,v 1.112 2010/07/18 10:58:06 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5816,6 +5816,17 @@
./usr/X11R7/include/xcb/sync.h -unknown- xorg
./usr/X11R7/include/xcb/xc_misc.h -unknown- xorg
./usr/X11R7/include/xcb/xcb.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_atom.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_aux.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_bitops.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_event.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_icccm.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_image.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_keysyms.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_pixel.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_property.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_renderutil.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_reply.h -unknown- xorg
./usr/X11R7/include/xcb/xcbext.h -unknown- xorg
./usr/X11R7/include/xcb/xevie.h -unknown- xorg
./usr/X11R7/include/xcb/xf86dri.h -unknown- xorg
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.1.1.1 src/external/mit/xorg/bin/xlsclients/Makefile:1.2
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sun Jul 18 10:58:06 2010
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:06 mrg Exp $
.include <bsd.own.mk>
PROG= xlsclients
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+
#BUILDSYMLINKS= xlscli.man xlsclients.man
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= -lxcb
+DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/lib/xcb-util/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/Makefile:1.2
--- src/external/mit/xorg/lib/xcb-util/Makefile:1.1 Sun Jul 18 07:01:38 2010
+++ src/external/mit/xorg/lib/xcb-util/Makefile Sun Jul 18 10:58:07 2010
@@ -1,6 +1,23 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:07 mrg Exp $
SUBDIR= atom property event aux .WAIT \
reply image icccm keysyms render-util
.include <bsd.subdir.mk>
+
+INCSDIR=${X11INCDIR}/xcb
+INCS= xcb_atom.h xcb_aux.h xcb_bitops.h xcb_event.h xcb_icccm.h \
+ xcb_image.h xcb_keysyms.h xcb_pixel.h xcb_property.h \
+ xcb_renderutil.h xcb_reply.h
+
+.include <bsd.inc.mk>
+
+.PATH: ${X11SRCDIR.xcb-util}/atom
+.PATH: ${X11SRCDIR.xcb-util}/aux
+.PATH: ${X11SRCDIR.xcb-util}/event
+.PATH: ${X11SRCDIR.xcb-util}/icccm
+.PATH: ${X11SRCDIR.xcb-util}/image
+.PATH: ${X11SRCDIR.xcb-util}/keysyms
+.PATH: ${X11SRCDIR.xcb-util}/property
+.PATH: ${X11SRCDIR.xcb-util}/renderutil
+.PATH: ${X11SRCDIR.xcb-util}/reply
