From 478d07119d39bf7424fb1fd2c4dde214f590e635 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Thu, 3 Jan 2019 23:39:47 +0000
Subject: [PATCH] define IPv6 unless not building INET6.

---
 external/mit/xorg/bin/proxymngr/Makefile | 6 +++++-
 external/mit/xorg/bin/xauth/Makefile     | 6 +++++-
 external/mit/xorg/bin/xhost/Makefile     | 6 +++++-
 external/mit/xorg/lib/libSM/Makefile     | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/external/mit/xorg/bin/proxymngr/Makefile b/external/mit/xorg/bin/proxymngr/Makefile
index 4311336144ae..639b979879cf 100644
--- a/external/mit/xorg/bin/proxymngr/Makefile
+++ b/external/mit/xorg/bin/proxymngr/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+#	$NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -23,6 +23,10 @@ FILESDIR=	${PROXYMANAGERDIR}
 LDADD+=	-lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 .PATH:	${X11SRCDIR.${PROG}}
 
 .include <bsd.x11.mk>
diff --git a/external/mit/xorg/bin/xauth/Makefile b/external/mit/xorg/bin/xauth/Makefile
index ec59843aac2b..2a0934d4baae 100644
--- a/external/mit/xorg/bin/xauth/Makefile
+++ b/external/mit/xorg/bin/xauth/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2017/03/04 23:23:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,10 @@ CPPFLAGS+= 		-DHAVE_STRLCPY
 CPPFLAGS.gethost.c=	${X11FLAGS.CONNECTION}
 CPPFLAGS.parsedpy.c=	${X11FLAGS.CONNECTION}
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      	-DIPv6
+.endif
+
 CWARNFLAGS.clang=	-Wno-empty-body
 
 LDADD+=	-lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
diff --git a/external/mit/xorg/bin/xhost/Makefile b/external/mit/xorg/bin/xhost/Makefile
index 04c2fd7854db..ddd4803e16d2 100644
--- a/external/mit/xorg/bin/xhost/Makefile
+++ b/external/mit/xorg/bin/xhost/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,10 @@ PROG=	xhost
 
 CPPFLAGS+=${X11FLAGS.CONNECTION} -DBSD44SOCKETS
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
diff --git a/external/mit/xorg/lib/libSM/Makefile b/external/mit/xorg/lib/libSM/Makefile
index 7692335c3c52..f68c3a152a2a 100644
--- a/external/mit/xorg/lib/libSM/Makefile
+++ b/external/mit/xorg/lib/libSM/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/09/13 04:32:30 cube Exp $
+#	$NetBSD: Makefile,v 1.4 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,6 +19,10 @@ CONN_DEFINES=	${X11FLAGS.CONNECTION} -DICE_t
 CPPFLAGS.sm_manager.c=	$(CONN_DEFINES)
 CPPFLAGS.sm_genid.c=	$(CONN_DEFINES)
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 LIBDPLIBS=ICE ${.CURDIR}/../libICE
 
 # XXXMRG