Sat Jul 15 13:54:07 2017 UTC ()
Missed a MKCRYPTO spot.

...although if nobody noticed, maybe that means this doesn't actually
use libcrypto?


(riastradh)
diff -r1.3 -r1.4 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs diff -r1.3 -r1.4 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile 2016/10/08 20:03:04 1.3
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile 2017/07/15 13:54:07 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $ 1# $NetBSD: Makefile,v 1.4 2017/07/15 13:54:07 riastradh Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "../../Makefile.Xserver" 5.include "../../Makefile.Xserver"
6 6
7PROG= Xvfb 7PROG= Xvfb
8 8
9.PATH: ${X11SRCDIR.xorg-server}/hw/vfb 9.PATH: ${X11SRCDIR.xorg-server}/hw/vfb
10.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man 10.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man
11.PATH: ${X11SRCDIR.xorg-server}/Xext 11.PATH: ${X11SRCDIR.xorg-server}/Xext
12.PATH: ${X11SRCDIR.xorg-server}/Xi 12.PATH: ${X11SRCDIR.xorg-server}/Xi
13.PATH: ${X11SRCDIR.xorg-server}/mi 13.PATH: ${X11SRCDIR.xorg-server}/mi
14SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c 14SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
@@ -101,30 +101,28 @@ DPADD+= ${DPADD.dix} \ @@ -101,30 +101,28 @@ DPADD+= ${DPADD.dix} \
101 ${DPADD.xkbstubs} \ 101 ${DPADD.xkbstubs} \
102 ${DPADD.composite} \ 102 ${DPADD.composite} \
103 ${DPADD.os} \ 103 ${DPADD.os} \
104 ${DPADD.glx} \ 104 ${DPADD.glx} \
105 ${LIBXFONT} \ 105 ${LIBXFONT} \
106 ${LIBFREETYPE} \ 106 ${LIBFREETYPE} \
107 ${LIBXAU} \ 107 ${LIBXAU} \
108 ${LIBFONTENC} \ 108 ${LIBFONTENC} \
109 ${LIBPIXMAN1} \ 109 ${LIBPIXMAN1} \
110 ${LIBXDMCP} \ 110 ${LIBXDMCP} \
111 ${LIBZ} \ 111 ${LIBZ} \
112 ${LIBM} 112 ${LIBM}
113 113
114.if ${MKCRYPTO:Uno} != "no" 
115LDADD+= -lcrypto 114LDADD+= -lcrypto
116DPADD+= ${LIBCRYPTO} 115DPADD+= ${LIBCRYPTO}
117.endif 
118 116
119.if ${MACHINE_ARCH} == "i386" 117.if ${MACHINE_ARCH} == "i386"
120LDADD+= -li386 118LDADD+= -li386
121DPADD+= ${LIBI386} 119DPADD+= ${LIBI386}
122.endif 120.endif
123 121
124.if ${MACHINE_ARCH} == "x86_64" 122.if ${MACHINE_ARCH} == "x86_64"
125LDADD+= -lx86_64 123LDADD+= -lx86_64
126DPADD+= ${LIBX86_64} 124DPADD+= ${LIBX86_64}
127.endif 125.endif
128 126
129.if ${MACHINE_ARCH} == "alpha" 127.if ${MACHINE_ARCH} == "alpha"
130LDADD+= -lalpha 128LDADD+= -lalpha