Module Name: src
Committed By: nia
Date: Fri Oct 16 06:55:36 UTC 2020
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
Log Message:
share/mk: Define some missing X11 libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/share/mk/bsd.README
cvs rdiff -u -r1.1225 -r1.1226 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.331 -r1.332 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.411 src/share/mk/bsd.README:1.412
--- src/share/mk/bsd.README:1.411 Sun Jul 26 09:22:43 2020
+++ src/share/mk/bsd.README Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.411 2020/07/26 09:22:43 rillig Exp $
+# $NetBSD: bsd.README,v 1.412 2020/10/16 06:55:36 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1803,8 +1803,11 @@ DPADD Additional dependencies for the p
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
LIBXCB?= ${DESTDIR}/usr/X11R7/lib/libxcb.a
+ LIBXCOMPOSITE?= ${DESTDIR}/usr/X11R7/lib/libXcomposite.a
+ LIBXDAMAGE?= ${DESTDIR}/usr/X11R7/lib/libXdamage.a
LIBXDMCP?= ${DESTDIR}/usr/X11R7/lib/libXdmcp.a
LIBXEXT?= ${DESTDIR}/usr/X11R7/lib/libXext.a
+ LIBXFIXES?= ${DESTDIR}/usr/X11R7/lib/libXfixes.a
LIBXFONT2?= ${DESTDIR}/usr/X11R7/lib/libXfont2.a
LIBXFONT?= ${DESTDIR}/usr/X11R7/lib/libXfont.a
LIBXFT?= ${DESTDIR}/usr/X11R7/lib/libXft.a
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1225 src/share/mk/bsd.own.mk:1.1226
--- src/share/mk/bsd.own.mk:1.1225 Fri Oct 9 23:58:50 2020
+++ src/share/mk/bsd.own.mk Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1225 2020/10/09 23:58:50 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1226 2020/10/16 06:55:36 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1572,7 +1572,7 @@ HAVE_XORG_GLAMOR?= no
.for _dir in \
xtrans fontconfig freetype evieext mkfontscale bdftopcf \
xorg-cf-files imake xbiff xkeyboard-config \
- xbitmaps appres xeyes xev xedit sessreg pixman \
+ xcompmgr xbitmaps appres xeyes xev xedit sessreg pixman \
beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
glu glw mesa-demos MesaGLUT MesaLib MesaLib.old MesaLib7 \
ico iceauth listres lndir \
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.331 src/share/mk/bsd.prog.mk:1.332
--- src/share/mk/bsd.prog.mk:1.331 Mon Jun 15 01:57:31 2020
+++ src/share/mk/bsd.prog.mk Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.331 2020/06/15 01:57:31 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.332 2020/10/16 06:55:36 nia Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -259,7 +259,7 @@ PAM_STATIC_DPADD=
_X11LIBLIST= dps fntstubs fontcache fontconfig fontenc freetype FS GL GLU \
ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
- Xxf86misc Xxf86vm
+ Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
.for _lib in ${_X11LIBLIST}
.ifndef LIB${_lib:tu}
