Tue Mar 7 20:56:08 2017 UTC ()
Apply patch (requested by mrg in ticket #1442):
Define HAVE_ARC4RANDOM_BUF


(snj)
diff -r1.2 -r1.2.28.1 src/external/mit/xorg/lib/libICE/Makefile
diff -r1.2 -r1.2.62.1 src/x11/lib/ICE/Makefile
cvs diff -r1.2 -r1.2.28.1 src/external/mit/xorg/lib/libICE/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libICE/Makefile 2008/09/13 04:32:30 1.2
+++ src/external/mit/xorg/lib/libICE/Makefile 2017/03/07 20:56:08 1.2.28.1
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $ 1# $NetBSD: Makefile,v 1.2.28.1 2017/03/07 20:56:08 snj Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= ICE 5LIB= ICE
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/X11/ICE 7.PATH: ${X11SRCDIR.${LIB}}/include/X11/ICE
8 8
9SRCS= accept.c authutil.c connect.c error.c getauth.c iceauth.c icetrans.c \ 9SRCS= accept.c authutil.c connect.c error.c getauth.c iceauth.c icetrans.c \
10 listen.c listenwk.c locking.c misc.c ping.c process.c protosetup.c \ 10 listen.c listenwk.c locking.c misc.c ping.c process.c protosetup.c \
11 register.c replywait.c setauth.c shutdown.c watch.c 11 register.c replywait.c setauth.c shutdown.c watch.c
12 12
13INCS= ICE.h ICEconn.h ICElib.h ICEmsg.h ICEproto.h ICEutil.h 13INCS= ICE.h ICEconn.h ICElib.h ICEmsg.h ICEproto.h ICEutil.h
14INCSDIR=${X11INCDIR}/X11/ICE 14INCSDIR=${X11INCDIR}/X11/ICE
15 15
16CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t=1 -DTRANS_CLIENT -DTRANS_SERVER 16CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t=1 -DTRANS_CLIENT -DTRANS_SERVER
17SOCK_DEFINES= -DBSD44SOCKETS 17SOCK_DEFINES= -DBSD44SOCKETS
18 18
19CPPFLAGS+= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) 19CPPFLAGS+= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)
 20CPPFLAGS+= -DHAVE_ARC4RANDOM_BUF
20 21
21PKGDIST= ${LIB} 22PKGDIST= ${LIB}
22 23
23.include <bsd.x11.mk> 24.include <bsd.x11.mk>
24.include <bsd.lib.mk> 25.include <bsd.lib.mk>
cvs diff -r1.2 -r1.2.62.1 src/x11/lib/ICE/Attic/Makefile (expand / switch to unified diff)

--- src/x11/lib/ICE/Attic/Makefile 2003/09/13 20:18:43 1.2
+++ src/x11/lib/ICE/Attic/Makefile 2017/03/07 20:56:08 1.2.62.1
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:43 lukem Exp $ 1# $NetBSD: Makefile,v 1.2.62.1 2017/03/07 20:56:08 snj Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= ICE 5LIB= ICE
6.PATH: ${X11SRCDIR.xc}/lib/${LIB} 6.PATH: ${X11SRCDIR.xc}/lib/${LIB}
7.PATH: ${X11SRCDIR.xc}/lib/xtrans 7.PATH: ${X11SRCDIR.xc}/lib/xtrans
8 8
9SRCS= accept.c authutil.c connect.c error.c getauth.c iceauth.c listen.c \ 9SRCS= accept.c authutil.c connect.c error.c getauth.c iceauth.c listen.c \
10 listenwk.c locking.c misc.c ping.c process.c protosetup.c \ 10 listenwk.c locking.c misc.c ping.c process.c protosetup.c \
11 register.c replywait.c setauth.c shutdown.c transport.c watch.c 11 register.c replywait.c setauth.c shutdown.c transport.c watch.c
12 12
13INCS= ICE.h ICEconn.h ICElib.h ICEmsg.h ICEproto.h ICEutil.h 13INCS= ICE.h ICEconn.h ICElib.h ICEmsg.h ICEproto.h ICEutil.h
14INCSDIR=${X11INCDIR}/X11/ICE 14INCSDIR=${X11INCDIR}/X11/ICE
15 15
16 16
17CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t -DTRANS_CLIENT -DTRANS_SERVER 17CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t -DTRANS_CLIENT -DTRANS_SERVER
18SOCK_DEFINES= -DBSD44SOCKETS 18SOCK_DEFINES= -DBSD44SOCKETS
19TRANS_INCLUDES= -I${X11SRCDIR.xc}/lib/xtrans 19TRANS_INCLUDES= -I${X11SRCDIR.xc}/lib/xtrans
20 20
21CPPFLAGS.accept.c= $(TRANS_INCLUDES) $(CONN_DEFINES) 21CPPFLAGS.accept.c= $(TRANS_INCLUDES) $(CONN_DEFINES)
22CPPFLAGS.connect.c= $(TRANS_INCLUDES) $(CONN_DEFINES) 22CPPFLAGS.connect.c= $(TRANS_INCLUDES) $(CONN_DEFINES)
23CPPFLAGS.listen.c= $(TRANS_INCLUDES) $(CONN_DEFINES) 23CPPFLAGS.listen.c= $(TRANS_INCLUDES) $(CONN_DEFINES)
24CPPFLAGS.listenwk.c= $(TRANS_INCLUDES) $(CONN_DEFINES) 24CPPFLAGS.listenwk.c= $(TRANS_INCLUDES) $(CONN_DEFINES)
25CPPFLAGS.misc.c= $(TRANS_INCLUDES) $(CONN_DEFINES) 25CPPFLAGS.misc.c= $(TRANS_INCLUDES) $(CONN_DEFINES)
26CPPFLAGS.shutdown.c= $(TRANS_INCLUDES) $(CONN_DEFINES) 26CPPFLAGS.shutdown.c= $(TRANS_INCLUDES) $(CONN_DEFINES)
27CPPFLAGS.transport.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) 27CPPFLAGS.transport.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)
 28CPPFLAGS+= -DHAVE_ARC4RANDOM_BUF
28 29
29.include <bsd.x11.mk> 30.include <bsd.x11.mk>
30.include <bsd.lib.mk> 31.include <bsd.lib.mk>