Module Name: src
Committed By: mrg
Date: Fri Sep 9 03:56:40 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libXfont2: Makefile
Log Message:
updates for libXfont2 2.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXfont2/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/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.8 src/external/mit/xorg/lib/libXfont2/Makefile:1.9
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.8 Tue Nov 16 09:25:51 2021
+++ src/external/mit/xorg/lib/libXfont2/Makefile Fri Sep 9 03:56:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/11/16 09:25:51 nia Exp $
+# $NetBSD: Makefile,v 1.9 2022/09/09 03:56:39 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -103,7 +103,14 @@ INCS= libxfont2.h
INCSDIR=${X11INCDIR}/X11/fonts
CPPFLAGS+= ${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
-CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_H
+CPPFLAGS+= -DHAS_SNPRINTF
+CPPFLAGS+= -DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
+CPPFLAGS+= -DHAVE_READLINK
+CPPFLAGS+= -DHAVE_STDINT_H
+CPPFLAGS+= -DHAVE_STRLCPY
+CPPFLAGS+= -DHAVE_ERR_H
+CPPFLAGS+= -DHAVE_REALPATH
+CPPFLAGS+= -DHAS_SNPRINTF
CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\"
CPPFLAGS+= -I${XFONT2DIR}/src/stubs
@@ -132,5 +139,8 @@ LIBDPLIBS=\
PKGDIST= ${LIB}
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@Z_REQUIRES@,zlib,"
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
