Module Name: src
Committed By: nia
Date: Fri Oct 16 08:28:17 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/bin: Makefile
Added Files:
src/external/mit/xorg/bin/xcompmgr: Makefile
Log Message:
Hook up xcompmgr to the build
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/xcompmgr/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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.158 src/distrib/sets/lists/xbase/mi:1.159
--- src/distrib/sets/lists/xbase/mi:1.158 Mon Oct 12 11:07:23 2020
+++ src/distrib/sets/lists/xbase/mi Fri Oct 16 08:28:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.158 2020/10/12 11:07:23 nia Exp $
+# $NetBSD: mi,v 1.159 2020/10/16 08:28:17 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -75,6 +75,7 @@
./usr/X11R7/bin/xclipboard xbase-xclipboard-bin xorg
./usr/X11R7/bin/xclock xbase-xclock-bin xorg
./usr/X11R7/bin/xcmsdb xbase-xcmsdb-bin xorg
+./usr/X11R7/bin/xcompmgr xbase-xcompmgr-bin xorg
./usr/X11R7/bin/xconsole xbase-xconsole-bin xorg
./usr/X11R7/bin/xcutsel xbase-xcutsel-bin xorg
./usr/X11R7/bin/xditview xbase-xditview-bin xorg
@@ -1328,6 +1329,7 @@
./usr/X11R7/man/cat1/xclipboard.0 xbase-xclipboard-catman .cat,xorg
./usr/X11R7/man/cat1/xclock.0 xbase-xclock-catman .cat,xorg
./usr/X11R7/man/cat1/xcmsdb.0 xbase-xcmsdb-catman .cat,xorg
+./usr/X11R7/man/cat1/xcompmgr.0 xbase-xcompmgr-catman .cat,xorg
./usr/X11R7/man/cat1/xconsole.0 xbase-xconsole-catman .cat,xorg
./usr/X11R7/man/cat1/xcutsel.0 xbase-xcutsel-catman .cat,xorg
./usr/X11R7/man/cat1/xditview.0 xbase-xditview-catman .cat,xorg
@@ -1475,6 +1477,7 @@
./usr/X11R7/man/html1/xclipboard.html xbase-xclipboard-htmlman html,xorg
./usr/X11R7/man/html1/xclock.html xbase-xclock-htmlman html,xorg
./usr/X11R7/man/html1/xcmsdb.html xbase-xcmsdb-htmlman html,xorg
+./usr/X11R7/man/html1/xcompmgr.html xbase-xcompmgr-htmlman html,xorg
./usr/X11R7/man/html1/xconsole.html xbase-xconsole-htmlman html,xorg
./usr/X11R7/man/html1/xcutsel.html xbase-xcutsel-htmlman html,xorg
./usr/X11R7/man/html1/xditview.html xbase-xditview-htmlman html,xorg
@@ -1623,6 +1626,7 @@
./usr/X11R7/man/man1/xclipboard.1 xbase-xclipboard-man .man,xorg
./usr/X11R7/man/man1/xclock.1 xbase-xclock-man .man,xorg
./usr/X11R7/man/man1/xcmsdb.1 xbase-xcmsdb-man .man,xorg
+./usr/X11R7/man/man1/xcompmgr.1 xbase-xcompmgr-man .man,xorg
./usr/X11R7/man/man1/xconsole.1 xbase-xconsole-man .man,xorg
./usr/X11R7/man/man1/xcutsel.1 xbase-xcutsel-man .man,xorg
./usr/X11R7/man/man1/xditview.1 xbase-xditview-man .man,xorg
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.15 src/external/mit/xorg/bin/Makefile:1.16
--- src/external/mit/xorg/bin/Makefile:1.15 Mon Mar 11 09:20:13 2019
+++ src/external/mit/xorg/bin/Makefile Fri Oct 16 08:28:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/03/11 09:20:13 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2020/10/16 08:28:17 nia Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres \
@@ -17,7 +17,7 @@ SUBDIR= appres bdftopcf bdftruncate befo
xlsfonts xmag xman xmessage xmh xmkmf xmlwf xmodmap xmore \
xprop xrandr xrdb xrefresh xset xsetmode xsetpointer \
xsetroot xsm xstdcmap xterm xtrap xvidtune \
- xvinfo xwd xwininfo xwud xdriinfo sessreg
+ xvinfo xwd xwininfo xwud xdriinfo sessreg xcompmgr
SUBDIR+=ssh-askpass
SUBDIR+=xsetwallpaper
Added files:
Index: src/external/mit/xorg/bin/xcompmgr/Makefile
diff -u /dev/null src/external/mit/xorg/bin/xcompmgr/Makefile:1.1
--- /dev/null Fri Oct 16 08:28:17 2020
+++ src/external/mit/xorg/bin/xcompmgr/Makefile Fri Oct 16 08:28:17 2020
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2020/10/16 08:28:17 nia Exp $
+
+.include <bsd.own.mk>
+
+PROG= xcompmgr
+
+LDADD+= -lm -lXcomposite -lXdamage -lXfixes -lXrender
+DPADD+= ${LIBM} ${LIBXCOMPOSITE} ${LIBXDAMAGE} ${LIBXFIXES} ${LIBXRENDER}
+LDADD+= -lX11 -lXext
+DPADD+= ${LIBX11} ${LIBXEXT}
+
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+.include "../../xorg-pkg-ver.mk"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
