[src/trunk]: src/external/mit/xorg/server/xorg-server.old/hw Fix MKCRYPTO=no ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ec16c1884c73
branches:  trunk
changeset: 346158:ec16c1884c73
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 29 19:36:35 2016 +0000

description:
Fix MKCRYPTO=no build

diffstat:

 external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile          |  13 ++++++---
 external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile |  11 +++++---
 external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile        |  11 ++++++--
 3 files changed, 23 insertions(+), 12 deletions(-)

diffs (98 lines):

diff -r d5bd806d8aec -r ec16c1884c73 external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile  Wed Jun 29 19:16:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile  Wed Jun 29 19:36:35 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -81,8 +81,7 @@
        -lpixman-1 \
        -lXdmcp \
        -lz \
-       -lm \
-       -lcrypto
+       -lm
 
 DPADD+=        ${DPADD.dix} \
        ${DPADD.fb} \
@@ -111,8 +110,12 @@
        ${LIBPIXMAN1} \
        ${LIBXDMCP} \
        ${LIBZ} \
-       ${LIBM} \
-       ${LIBCRYPTO}
+       ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=        -lcrypto
+DPADD+=        ${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=        -li386
diff -r d5bd806d8aec -r ec16c1884c73 external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile Wed Jun 29 19:16:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile Wed Jun 29 19:36:35 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -62,7 +62,6 @@
 LDADD+=        ${LDADD.hw/xfree86/dixmods/xorgxkb}
 LDADD+=        -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=        -lpciaccess -ldrm
-LDADD+=        -lcrypto
 LDADD+=        -Wl,--no-whole-archive
 
 .if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@
        ${DPADD.hw/xfree86/i2c} \
        ${LIBCWRAPPER} \
        ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
-       ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
-       ${LIBCRYPTO}
+       ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=        -lcrypto
+DPADD+=        ${LIBCRYPTO}
+.endif
 
 SYMLINKS=      ${X11BINDIR}/Xorg ${X11BINDIR}/X
 
diff -r d5bd806d8aec -r ec16c1884c73 external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile        Wed Jun 29 19:16:23 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile        Wed Jun 29 19:36:35 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -71,7 +71,7 @@
        ${LDADD.glx} \
        -lXfont -lXext -lfontenc \
        -lpixman-1 -lX11 -lXau \
-       -lXdmcp -lfreetype -lm -lcrypto
+       -lXdmcp -lfreetype -lm
 
 DPADD+=        ${LDADD.dix} \
        ${DPADD.fb} \
@@ -95,7 +95,12 @@
        ${DPADD.glx} \
        ${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
        ${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
-       ${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+       ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=        -lcrypto
+DPADD+=        ${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=        -li386