Thu Jul 14 03:48:49 2022 UTC ()

add libxcvt.


(mrg)

diff -r1.439 -r1.440 src/share/mk/bsd.README
diff -r1.1285 -r1.1286 src/share/mk/bsd.own.mk
diff -r1.340 -r1.341 src/share/mk/bsd.prog.mk

--- src/share/mk/bsd.README 2022/06/06 10:56:29	1.439
+++ src/share/mk/bsd.README 2022/07/14 03:48:49	1.440

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.README,v 1.439 2022/06/06 10:56:29 nia Exp $
+#	$NetBSD: bsd.README,v 1.440 2022/07/14 03:48:49 mrg Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 This is the README file for the make "include" files for the NetBSD
 source tree.  The files are installed in /usr/share/mk, and are,
 by convention, named with the suffix ".mk".
 Note, this file is not intended to replace reading through the .mk
 files for anything tricky.
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 RANDOM THINGS WORTH KNOWING:
 @@ -1802,26 +1802,27 @@ DPADD		Additional dependencies for the p
 		LIBFREETYPE?=		${DESTDIR}/usr/X11R7/lib/libfreetype.a
 		LIBFS?=			${DESTDIR}/usr/X11R7/lib/libFS.a
 		LIBGL?=			${DESTDIR}/usr/X11R7/lib/libGL.a
 		LIBGLU?=		${DESTDIR}/usr/X11R7/lib/libGLU.a
 		LIBICE?=		${DESTDIR}/usr/X11R7/lib/libICE.a
 		LIBLBXUTIL?=		${DESTDIR}/usr/X11R7/lib/liblbxutil.a
 		LIBSM?=			${DESTDIR}/usr/X11R7/lib/libSM.a
 		LIBX11?=		${DESTDIR}/usr/X11R7/lib/libX11.a
 		LIBX11_XCB?=		${DESTDIR}/usr/X11R7/lib/libX11-xcb.a
 		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
 		LIBXCVT?=		${DESTDIR}/usr/X11R7/lib/libxcvt.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
 		LIBXI?=			${DESTDIR}/usr/X11R7/lib/libXi.a
 		LIBXINERAMA?=		${DESTDIR}/usr/X11R7/lib/libXinerama.a
 		LIBXKBFILE?=		${DESTDIR}/usr/X11R7/lib/libxkbfile.a
 		LIBXMU?=		${DESTDIR}/usr/X11R7/lib/libXmu.a
 		LIBXMUU?=		${DESTDIR}/usr/X11R7/lib/libXmuu.a
 		LIBXPM?=		${DESTDIR}/usr/X11R7/lib/libXpm.a

--- src/share/mk/bsd.own.mk 2022/06/06 10:56:29	1.1285
+++ src/share/mk/bsd.own.mk 2022/07/14 03:48:49	1.1286

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.own.mk,v 1.1285 2022/06/06 10:56:29 nia Exp $
+#	$NetBSD: bsd.own.mk,v 1.1286 2022/07/14 03:48:49 mrg Exp $
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
 .endif
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
 MAKECONF?=	/etc/mk.conf
 .-include "${MAKECONF}"
+#
 @@ -1557,27 +1557,27 @@ X11LIBDIR?=		${X11ROOTDIR}/lib/X11
 X11MANDIR?=		${X11ROOTDIR}/man
 X11SHAREDIR?=		${X11ROOTDIR}/share
 X11USRLIBDIR?=		${X11ROOTDIR}/lib${MLIBDIR:D/${MLIBDIR}}
+#
 # New modular-xorg based builds
+#
 X11SRCDIRMIT?=		${X11SRCDIR}/external/mit
 .for _lib in \
 	FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
 	Xdmcp Xevie Xext Xfixes Xfont Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \
 	Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
 	epoxy fontenc vdpau xkbfile xkbui Xaw pciaccess xcb xshmfence \
-	pthread-stubs
+	pthread-stubs xcvt
 X11SRCDIR.${_lib}?=		${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor
 .for _proto in \
 	xcb- xorg
 X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor
 # During transition from xorg-server 1.10 to 1.20
 .if \
     ${MACHINE} == "alpha"	|| \
     ${MACHINE} == "netwinder"	|| \
     ${MACHINE} == "sgimips"	|| \

--- src/share/mk/bsd.prog.mk 2021/11/28 15:49:36	1.340
+++ src/share/mk/bsd.prog.mk 2022/07/14 03:48:49	1.341

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.prog.mk,v 1.340 2021/11/28 15:49:36 christos Exp $
+#	$NetBSD: bsd.prog.mk,v 1.341 2022/07/14 03:48:49 mrg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 .ifndef HOSTPROG
 .include <bsd.init.mk>
 .include <bsd.shlib.mk>
 .include <bsd.gcc.mk>
 .include <bsd.sanitizer.mk>
 ##### Sanitizer specific flags.
 CFLAGS+=	${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS}
 CXXFLAGS+=	${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS}
 @@ -251,27 +251,27 @@ PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5}
 PAM_STATIC_LDADD+= -lskey
 PAM_STATIC_DPADD+= ${LIBSKEY}
 .endif
 PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
 PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
 .else
 PAM_STATIC_LDADD=
 PAM_STATIC_DPADD=
 .endif
 #	NB:	If you are a library here, add it in bsd.README
 #	This list is sorted with -f so that it matches the order in bsd.README
 _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 \
+    ICE lbxutil SM X11 X11_xcb Xau Xaw xcb xcvt Xdmcp Xext Xfont Xfont2 Xft Xi \
     Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
     Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
 _XCBLIBLIST= \
     atom aux composite damage dpms dri2 dri3 event glx icccm image keysyms \
     present property randr record render_util render reply res screensaver \
     shape shm sync xf86dri xfixes xinerama xinput xkb xtest xv xvmc
 # Ugly one-offs
 LIBX11_XCB=	${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
 LIBXCB=	${DESTDIR}${X11USRLIBDIR}/libxcb.a
 .for _lib in ${_X11LIBLIST}
 .ifndef LIB${_lib:tu}