[Midnightbsd-cvs] src [11667] trunk/secure/libexec: use ldns

[laffer1 at midnightbsd.org]

Revision: 11667
          http://svnweb.midnightbsd.org/src/?rev=11667
Author:   laffer1
Date:     2018-07-08 16:05:27 -0400 (Sun, 08 Jul 2018)
Log Message:
-----------
use ldns

Modified Paths:
--------------
    trunk/secure/libexec/sftp-server/Makefile
    trunk/secure/libexec/ssh-keysign/Makefile
    trunk/secure/libexec/ssh-pkcs11-helper/Makefile

Modified: trunk/secure/libexec/sftp-server/Makefile
===================================================================
--- trunk/secure/libexec/sftp-server/Makefile	2018-07-08 20:05:05 UTC (rev 11666)
+++ trunk/secure/libexec/sftp-server/Makefile	2018-07-08 20:05:27 UTC (rev 11667)
@@ -1,15 +1,28 @@
-# $MidnightBSD: src/secure/libexec/sftp-server/Makefile,v 1.4 2009/05/02 18:00:56 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/secure/libexec/sftp-server/Makefile 296781 2016-03-12 23:53:20Z des $
 
+.include <bsd.own.mk>
+
 PROG=   sftp-server
-SRCS=   sftp-server.c sftp-common.c sftp-server-main.c roaming_dummy.c
+SRCS=   sftp-server.c sftp-common.c sftp-server-main.c
 MAN=	sftp-server.8
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+=	ssh_namespace.h
 
-DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD=	-lssh -lcrypt -lcrypto -lz
+DPADD=	${LIBSSH}
+LDADD=  -lssh
+USEPRIVATELIB= ssh
 
+.if ${MK_LDNS} != "no"
+CFLAGS+=	-DHAVE_LDNS=1
+#DPADD+=	${LIBLDNS}
+#LDADD+=	-lldns
+#USEPRIVATELIB+= ldns
+.endif
+
+DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lcrypt -lcrypto -lz
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h

Modified: trunk/secure/libexec/ssh-keysign/Makefile
===================================================================
--- trunk/secure/libexec/ssh-keysign/Makefile	2018-07-08 20:05:05 UTC (rev 11666)
+++ trunk/secure/libexec/ssh-keysign/Makefile	2018-07-08 20:05:27 UTC (rev 11667)
@@ -1,16 +1,29 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/secure/libexec/ssh-keysign/Makefile 296781 2016-03-12 23:53:20Z des $
 
+.include <bsd.own.mk>
+
 PROG=	ssh-keysign
-SRCS=	ssh-keysign.c readconf.c roaming_dummy.c
+SRCS=	ssh-keysign.c readconf.c
 MAN=	ssh-keysign.8
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+=	ssh_namespace.h
 BINMODE=4555
 
-DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD=	-lssh -lcrypt -lcrypto -lz
+DPADD=	${LIBSSH}
+LDADD=	-lssh
+USEPRIVATELIB= ssh
 
+.if ${MK_LDNS} != "no"
+CFLAGS+=	-DHAVE_LDNS=1
+#DPADD+=	${LIBLDNS}
+#LDADD+=	-lldns
+#USEPRIVATELIB+= ldns
+.endif
+
+DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LDADD+= -lcrypt -lcrypto -lz
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h

Modified: trunk/secure/libexec/ssh-pkcs11-helper/Makefile
===================================================================
--- trunk/secure/libexec/ssh-pkcs11-helper/Makefile	2018-07-08 20:05:05 UTC (rev 11666)
+++ trunk/secure/libexec/ssh-pkcs11-helper/Makefile	2018-07-08 20:05:27 UTC (rev 11667)
@@ -1,16 +1,28 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/secure/libexec/ssh-pkcs11-helper/Makefile 296781 2016-03-12 23:53:20Z des $
 
+.include <bsd.own.mk>
+
 PROG=	ssh-pkcs11-helper
 SRCS=	ssh-pkcs11.c ssh-pkcs11-helper.c
-SRCS+=	roaming_dummy.c
 MAN=	ssh-pkcs11-helper.8
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
+SRCS+=	ssh_namespace.h
 
-DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD=	-lssh -lcrypt -lcrypto -lz
+DPADD=	${LIBSSH}
+LDADD=	-lssh
+USEPRIVATELIB= ssh
 
+.if ${MK_LDNS} != "no"
+CFLAGS+=	-DHAVE_LDNS=1
+#DPADD+=	${LIBLDNS}
+#LDADD+=	-lldns
+#USEPRIVATELIB+= ldns
+.endif
+
+DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LDADD+= -lcrypt -lcrypto -lz
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h