Module Name: src
Committed By: mrg
Date: Sun Mar 9 08:26:30 UTC 2025
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
src/external/mit/xorg/bin/xinit: Makefile
src/external/mit/xorg/lib/libSM: Makefile
src/external/mit/xorg/lib/libX11: Makefile.libx11
src/share/mk: bsd.x11.mk
Log Message:
actually, since Xtrans needs them, add the new -DHAVE_GETADDRINFO,
-DHAVE_INET_NTOP, and -DHAVE_STRUCT_SOCKADDR_STORAGE to X11FLAGS.CONNECTION.
xdm/xinit gains -DHAVE_ASPRINTF.
libX11 gets xim_trans.c compiled properly.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xinit/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libSM/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.160 -r1.161 src/share/mk/bsd.x11.mk
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/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.20 src/external/mit/xorg/bin/xdm/Makefile:1.21
--- src/external/mit/xorg/bin/xdm/Makefile:1.20 Mon Apr 29 22:09:11 2024
+++ src/external/mit/xorg/bin/xdm/Makefile Sun Mar 9 08:26:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/04/29 22:09:11 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2025/03/09 08:26:29 mrg Exp $
.include <bsd.own.mk>
@@ -18,6 +18,7 @@ DEF_USER_PATH= /sbin:/usr/sbin:/bin:/usr
DEF_SYSTEM_PATH=/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}
CPPFLAGS+= -DRETSIGTYPE=void
+CPPFLAGS+= -DHAVE_ASPRINTF
CPPFLAGS.auth.c+= -DBSD44SOCKETS
CPPFLAGS.socket.c+= -DBSD44SOCKETS
CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.11 src/external/mit/xorg/bin/xinit/Makefile:1.12
--- src/external/mit/xorg/bin/xinit/Makefile:1.11 Mon Oct 12 11:43:11 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Sun Mar 9 08:26:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $
+# $NetBSD: Makefile,v 1.12 2025/03/09 08:26:29 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ XINITDIR= ${X11ETCDIR}/xinit
CPPFLAGS+= ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
-DRETSIGTYPE=void
+CPPFLAGS+= -DHAVE_ASPRINTF
CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
Index: src/external/mit/xorg/lib/libSM/Makefile
diff -u src/external/mit/xorg/lib/libSM/Makefile:1.6 src/external/mit/xorg/lib/libSM/Makefile:1.7
--- src/external/mit/xorg/lib/libSM/Makefile:1.6 Sun Mar 9 06:03:51 2025
+++ src/external/mit/xorg/lib/libSM/Makefile Sun Mar 9 08:26:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2025/03/09 06:03:51 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2025/03/09 08:26:29 mrg Exp $
.include <bsd.own.mk>
@@ -15,8 +15,6 @@ INCSDIR=${X11INCDIR}/X11/SM
CPPFLAGS+= ${X11FLAGS.THREADLIB}
# XXX not yet; libuuid_ul is not yet ready.
#CPPFLAGS+= -DHAVE_LIBUUID
-CPPFLAGS+= -DHAVE_GETADDRINFO -DHAVE_INET_NTOP \
- -DHAVE_STRUCT_SOCKADDR_STORAGE
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.27 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.28
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.27 Sun Mar 9 06:03:51 2025
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sun Mar 9 08:26:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.27 2025/03/09 06:03:51 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.28 2025/03/09 08:26:30 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -407,7 +407,6 @@ CPPFLAGS+= -DHAVE_SYS_FILIO_H -DHAVE_SYS
CPPFLAGS+= -DHAVE_REALLOCARRAY
CPPFLAGS+= -DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE___BUILTIN_POPCOUNTL
CPPFLAGS+= -DUSE_THREAD_SAFETY_CONSTRUCTOR
-CPPFLAGS+= -DHAVE_GETADDRINFO -DHAVE_INET_NTOP -DHAVE_STRUCT_SOCKADDR_STORAGE
CPPFLAGS+= -DUSE_XCB
SRCS+= \
@@ -461,6 +460,7 @@ CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(X
CPPFLAGS.lcFile.c= $(XLC_DEFINES) $(SETID_DEFINES)
CPPFLAGS.x11trans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES)
CPPFLAGS.ximtrans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES)
+CPPFLAGS.xim_trans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES)
#BUILDSYMLINKS= transport.c x11trans.c \
# transport.c ximtrans.c
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.160 src/share/mk/bsd.x11.mk:1.161
--- src/share/mk/bsd.x11.mk:1.160 Wed Feb 26 01:18:19 2025
+++ src/share/mk/bsd.x11.mk Sun Mar 9 08:26:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.160 2025/02/26 01:18:19 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.161 2025/03/09 08:26:29 mrg Exp $
.include <bsd.init.mk>
@@ -22,7 +22,8 @@ X11FLAGS.THREADS= -DXTHREADS -D_REENTRAN
# CONNECTION_FLAGS
X11FLAGS.CONNECTION= -DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT \
- -DHAS_FCHOWN
+ -DHAS_FCHOWN -DHAVE_GETADDRINFO -DHAVE_INET_NTOP \
+ -DHAVE_STRUCT_SOCKADDR_STORAGE
.if (${USE_INET6} != "no")
X11FLAGS.CONNECTION+= -DIPv6
