After some horrible wrestling with Subversion's worthless merge

implementation, merge ^/head r275078 through r275117. Note that all the extraneous mergeinfo is there because Subversion created it. I'll hopefully be able to remove it again when merging back to head.
2014-11-26 14:36:04 +00:00 · 2014-11-26 14:36:04 +00:00 · 1181e9f8a2
commit 1181e9f8a2
parent 2c97f721e7 8592f07464
53 changed files with 145 additions and 173 deletions
--- a/contrib/ofed/libmlx4/src/cq.c
+++ b/contrib/ofed/libmlx4/src/cq.c
@ -109,15 +109,16 @@ struct mlx4_err_cqe {

 static struct mlx4_cqe *get_cqe(struct mlx4_cq *cq, int entry)
 {
-	return cq->buf.buf + entry * MLX4_CQ_ENTRY_SIZE;
+	return cq->buf.buf + entry * cq->cqe_size;
 }

 static void *get_sw_cqe(struct mlx4_cq *cq, int n)
 {
 	struct mlx4_cqe *cqe = get_cqe(cq, n & cq->ibv_cq.cqe);
+	struct mlx4_cqe *tcqe = cq->cqe_size == 64 ? cqe + 1 : cqe;

-	return (!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^
-		!!(n & (cq->ibv_cq.cqe + 1))) ? NULL : cqe;
+	return (!!(tcqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^
+		!!(n & (cq->ibv_cq.cqe + 1))) ? NULL : tcqe;
 }

 static struct mlx4_cqe *next_cqe_sw(struct mlx4_cq *cq)
@ -402,6 +403,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, uint32_t qpn, struct mlx4_srq *srq)
 	uint8_t owner_bit;
 	int nfreed = 0;
 	int is_xrc_srq = 0;
+	int cqe_inc = cq->cqe_size == 64 ? 1 : 0;

 	if (srq && srq->ibv_srq.xrc_cq)
 		is_xrc_srq = 1;
@ -423,6 +425,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, uint32_t qpn, struct mlx4_srq *srq)
 	 */
 	while ((int) --prod_index - (int) cq->cons_index >= 0) {
 		cqe = get_cqe(cq, prod_index & cq->ibv_cq.cqe);
+		cqe += cqe_inc;
 		if (is_xrc_srq &&
 		    (ntohl(cqe->g_mlpath_rqpn & 0xffffff) == srq->srqn) &&
 		    !(cqe->owner_sr_opcode & MLX4_CQE_IS_SEND_MASK)) {
@ -434,6 +437,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, uint32_t qpn, struct mlx4_srq *srq)
 			++nfreed;
 		} else if (nfreed) {
 			dest = get_cqe(cq, (prod_index + nfreed) & cq->ibv_cq.cqe);
+			dest += cqe_inc;
 			owner_bit = dest->owner_sr_opcode & MLX4_CQE_OWNER_MASK;
 			memcpy(dest, cqe, sizeof *cqe);
 			dest->owner_sr_opcode = owner_bit |
@ -473,28 +477,32 @@ void mlx4_cq_resize_copy_cqes(struct mlx4_cq *cq, void *buf, int old_cqe)
 {
 	struct mlx4_cqe *cqe;
 	int i;
+	int cqe_inc = cq->cqe_size == 64 ? 1 : 0;

 	i = cq->cons_index;
 	cqe = get_cqe(cq, (i & old_cqe));
+	cqe += cqe_inc;

 	while ((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) != MLX4_CQE_OPCODE_RESIZE) {
 		cqe->owner_sr_opcode = (cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK) |
 			(((i + 1) & (cq->ibv_cq.cqe + 1)) ? MLX4_CQE_OWNER_MASK : 0);
-		memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * MLX4_CQ_ENTRY_SIZE,
-		       cqe, MLX4_CQ_ENTRY_SIZE);
+		memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * cq->cqe_size,
+		       cqe - cqe_inc, cq->cqe_size);
 		++i;
 		cqe = get_cqe(cq, (i & old_cqe));
+		cqe += cqe_inc;
 	}

 	++cq->cons_index;
 }

-int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent)
+int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent,
+			int entry_size)
 {
-	if (mlx4_alloc_buf(buf, align(nent * MLX4_CQ_ENTRY_SIZE, dev->page_size),
+	if (mlx4_alloc_buf(buf, align(nent * entry_size, dev->page_size),
 			   dev->page_size))
 		return -1;
-	memset(buf->buf, 0, nent * MLX4_CQ_ENTRY_SIZE);
+	memset(buf->buf, 0, nent * entry_size);

 	return 0;
 }
--- a/contrib/ofed/libmlx4/src/mlx4-abi.h
+++ b/contrib/ofed/libmlx4/src/mlx4-abi.h
@ -40,9 +40,11 @@

 struct mlx4_alloc_ucontext_resp {
 	struct ibv_get_context_resp	ibv_resp;
+	__u32				dev_caps;
 	__u32				qp_tab_size;
 	__u16				bf_reg_size;
 	__u16				bf_regs_per_page;
+	__u32				cqe_size;
 };

 struct mlx4_alloc_pd_resp {
--- a/contrib/ofed/libmlx4/src/mlx4.c
+++ b/contrib/ofed/libmlx4/src/mlx4.c
@ -201,6 +201,7 @@ static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_
 		context->bf_buf_size = 0;
 	}

+	context->cqe_size = resp.cqe_size;
 	pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE);

 	context->ibv_ctx.ops = mlx4_ctx_ops;
--- a/contrib/ofed/libmlx4/src/mlx4.h
+++ b/contrib/ofed/libmlx4/src/mlx4.h
@ -102,10 +102,6 @@
 	   _a < _b ? _a : _b; })
 #endif

-enum {
-	MLX4_CQ_ENTRY_SIZE		= 0x20
-};
-
 enum {
 	MLX4_STAT_RATE_OFFSET		= 5
 };
@ -192,6 +188,7 @@ struct mlx4_context {
 	int				max_qp_wr;
 	int				max_sge;
 	int				max_cqe;
+	int				cqe_size;

 	struct {
 		struct mlx4_srq       **table;
@ -226,6 +223,7 @@ struct mlx4_cq {
 	uint32_t		       *set_ci_db;
 	uint32_t		       *arm_db;
 	int				arm_sn;
+	int				cqe_size;
 };

 struct mlx4_srq {
@ -369,7 +367,8 @@ int mlx4_dereg_mr(struct ibv_mr *mr);
 struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe,
 			       struct ibv_comp_channel *channel,
 			       int comp_vector);
-int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent);
+int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent,
+		      int entry_size);
 int mlx4_resize_cq(struct ibv_cq *cq, int cqe);
 int mlx4_destroy_cq(struct ibv_cq *cq);
 int mlx4_poll_cq(struct ibv_cq *cq, int ne, struct ibv_wc *wc);
--- a/contrib/ofed/libmlx4/src/verbs.c
+++ b/contrib/ofed/libmlx4/src/verbs.c
@ -168,6 +168,7 @@ struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe,
 	struct mlx4_create_cq_resp resp;
 	struct mlx4_cq		  *cq;
 	int			   ret;
+	struct mlx4_context	   *mctx = to_mctx(context);

 	/* Sanity check CQ size before proceeding */
 	if (cqe > 0x3fffff)
@ -184,9 +185,11 @@ struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe,

 	cqe = align_queue_size(cqe + 1);

-	if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe))
+	if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe, mctx->cqe_size))
 		goto err;

+	cq->cqe_size = mctx->cqe_size;
+
 	cq->set_ci_db  = mlx4_alloc_db(to_mctx(context), MLX4_DB_TYPE_CQ);
 	if (!cq->set_ci_db)
 		goto err_buf;
@ -247,7 +250,8 @@ int mlx4_resize_cq(struct ibv_cq *ibcq, int cqe)
 		goto out;
 	}

-	ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe);
+	ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe,
+					cq->cqe_size);
 	if (ret)
 		goto out;

--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@ -626,4 +626,3 @@ CFLAGS+=	-I${KRB5DIR}/lib/krb5 \
 .include <bsd.lib.mk>

 .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/
-USEPRIVATELIB= heimipcc
--- a/lib/libpam/libpam/tests/Makefile
+++ b/lib/libpam/libpam/tests/Makefile
@ -13,7 +13,6 @@ SRCS.${test} = ${test}.c ${COMMONSRC}
 CFLAGS +=-I${OPENPAM}/include -I${OPENPAM}/lib/libpam -I${OPENPAM}/t
 WARNS ?= 6

-DPADD = ${LIBPAM}
-LDADD = ${MINUSLPAM}
+LIBADD =	pam

 .include <bsd.test.mk>
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@ -11,13 +11,11 @@ MAN=	login.1

 CFLAGS+=-DLOGALL

-DPADD=	${LIBUTIL} ${LIBCRYPT}
-LDADD=	-lutil -lcrypt
+LIBADD=	util crypt

 .if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+= -DUSE_PAM
-DPADD+=	${LIBPAM}
-LDADD+=	${MINUSLPAM}
+LIBADD+=	pam
 .endif

 BINOWN=	root
--- a/release/picobsd/tinyware/oinit/Makefile
+++ b/release/picobsd/tinyware/oinit/Makefile
@ -14,7 +14,7 @@ CFLAGS=		-DSH_PATH=\"${SH_PATH}\" -DSH_NAME=\"${SH_NAME}\" \
 #CFLAGS+=	-DOINIT_RC=\"/etc/oinit.rc\"

 #LDADD=		-lutil -ledit -ltermcap
-LDADD=-lutil
+LIBADD=	util
 MAN=

 .include <bsd.prog.mk>
--- a/release/picobsd/tinyware/passwd/Makefile
+++ b/release/picobsd/tinyware/passwd/Makefile
@ -11,8 +11,7 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
 	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
 CFLAGS+=-Wall

-DPADD=	${LIBCRYPT} ${LIBUTIL}
-LDADD=	-lcrypt -lutil
+LIBADD=	crypt util
 .PATH:  ${.CURDIR}/../../../../usr.bin/chpass \
 #	${.CURDIR}/../../../../usr.sbin/vipw \
 #	${.CURDIR}/../../../../usr.bin/passwd
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@ -41,7 +41,6 @@ CFLAGS+= -I${SSHDIR} -include ssh_namespace.h

 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
-LIBADD+=	gssapi krb5 hx509 asn1 com_err md roken
 .endif

 .if ${MK_OPENSSH_NONE_CIPHER} != "no"
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@ -21,8 +21,6 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypto crypto z
-
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@ -17,7 +17,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypt crypto z
+LIBADD+=	crypto

 .include <bsd.prog.mk>

--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@ -21,7 +21,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypt crypto z
+LIBADD+=	crypto

 .include <bsd.prog.mk>

--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@ -20,8 +20,6 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypt crypto z
-
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@ -20,8 +20,6 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIABDD+=	crypt crypto z
-
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@ -20,8 +20,6 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypt crypto z
-
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@ -20,7 +20,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypt crypto z
+LIBADD+=	crypto

 .include <bsd.prog.mk>

--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@ -15,10 +15,9 @@ LIBADD=	ssh

 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
-LIBADD+=	ldns
 .endif

-LIBADD+=	crypt crypto z
+LIBADD+=	crypto

 .include <bsd.prog.mk>

--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@ -15,8 +15,6 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif

-LIBADD+=	crypt crypto z
-
 .include <bsd.prog.mk>

 .PATH:	${SSHDIR}
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@ -15,11 +15,10 @@ SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c

-LIBADD=	ssh util
+LIBADD=	ssh

 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
-LIBADD+=	ldns
 .endif

 .if ${MK_KERBEROS_SUPPORT} != "no"
@ -31,7 +30,7 @@ LIBADD+=	gssapi
 CFLAGS+= -DNONE_CIPHER_ENABLED
 .endif

-LIBADD+=	crypt crypto z
+LIBADD+=	crypto

 .if defined(LOCALBASE)
 CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@ -25,7 +25,8 @@ SRCS+=	gss-genr.c
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h

-LIBADD=	ssh util wrap pam
+# pam should always happen before ssh here for static linking
+LIBADD=	pam ssh util wrap

 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@ -41,25 +42,14 @@ LIBADD+=	bsm

 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
-LIBADD+=	gssapi_krb5 gssapi krb5 hx509 asn1 com_err roken wind heimbase \
-		heimipcc
+LIBADD+=	gssapi_krb5 gssapi krb5
 .endif

 .if ${MK_OPENSSH_NONE_CIPHER} != "no"
 CFLAGS+= -DNONE_CIPHER_ENABLED
 .endif

-LIBADD+= crypt crypto z
-
-# Fix the order of NEEDED entries for libthr and libc. The libthr
-# needs to interpose libc symbols, leaving the libthr loading as
-# dependency of krb causes reversed order and broken interposing. Put
-# the threading library last on the linker command line, just before
-# the -lc added by a compiler driver.
-# XXX In theory the framework now takes care of that, it needs to be checked
-.if ${MK_KERBEROS_SUPPORT} != "no"
-LIBADD+=	pthread
-.endif
+LIBADD+=	crypto

 .if defined(LOCALBASE)
 CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@ -91,33 +91,7 @@ LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
 LIBNV?=		${DESTDIR}${LIBDIR}/libnv.a
 LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
-
-# The static PAM library doesn't know its secondary dependencies,
-# so we have to specify them explicitly. Ths is an unfortunate,
-# but necessary departure from testing MK_ flags to define
-# values here.
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
-MINUSLPAM=	-lpam
-.if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
-.if ${MK_KERBEROS} != "no"
-LIBPAM+=	${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
-		${LIBROKEN} ${LIBCOM_ERR}
-MINUSLPAM+=	-lkrb5 -lhx509 -lasn1 -lcrypto -lcrypt -lroken -lcom_err
-.endif
-LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \
-		${LIBUTIL} ${LIBOPIE} ${LIBMD}
-MINUSLPAM+=	-lradius -ltacplus -lcrypt \
-		-lutil -lopie -lmd
-.if ${MK_OPENSSH} != "no"
-LIBPAM+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
-MINUSLPAM+=	-lssh -lcrypto -lcrypt
-.endif
-.if ${MK_NIS} != "no"
-LIBPAM+=	${LIBYPCLNT}
-MINUSLPAM+=	-lypclnt
-.endif
-.endif
-
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPJDLOG?=	${DESTDIR}${LIBDIR}/libpjdlog.a
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@ -159,6 +159,9 @@ _DP_archive+=	md
 .endif
 _DP_ssl=	crypto
 _DP_ssh=	crypto crypt
+.if ${MK_LDNS} != "no"
+_DP_ssh+=	ldns z
+.endif
 _DP_edit=	ncursesw
 .if ${MK_OPENSSL} != "no"
 _DP_bsnmp=	crypto
@ -214,7 +217,9 @@ _DP_pam+=	ssh
 .if ${MK_NIS} != "no"
 _DP_pam+=	ypclnt
 .endif
-_DP_krb5+=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
+_DP_krb5+=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc \
+		pthread
+_DP_gssapi_krb5+=	gssapi krb5 crypto roken asn1 com_err

 # Define spacial cases
 LDADD_supcplusplus=	-lsupc++
@ -256,6 +261,10 @@ DPADD_hdb+=	${DPADD_pthread}
 LDADD_hdb+=	${LDADD_pthread}
 DPADD_kadm5srv+=	${DPADD_pthread}
 LDADD_kadm5srv+=	${LDADD_pthread}
+DPADD_krb5+=	${DPADD_pthread}
+LDADD_krb5+=	${LDADD_pthread}
+DPADD_gssapi_krb5+=	${DPADD_pthread}
+LDADD_gssapi_krb5+=	${LDADD_pthread}

 .for _l in ${LIBADD}
 .if ${_PRIVATELIBS:M${_l}}
@ -278,54 +287,42 @@ LDATF_CXX?=	${LIBATF_CXXDIR}/libatf-c++.so
 LIBATF_CXX?=	${LIBATF_CXXDIR}/libatf-c++.a

 LIBBSDSTATDIR=	${ROOTOBJDIR}/lib/libbsdstat
-LDBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.so
 LIBBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.a

 LIBEVENTDIR=	${ROOTOBJDIR}/lib/libevent
-LDEVENT?=	${LIBEVENTDIR}/libevent.a
 LIBEVENT?=	${LIBEVENTDIR}/libevent.a

 LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
-LDHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.so
 LIBHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.a

 LIBHEIMIPCSDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcs
-LDHEIMIPCS?=	${LIBHEIMIPCSDIR}/libheimipcs.so
 LIBHEIMIPCS?=	${LIBHEIMIPCSDIR}/libheimipcs.a

 LIBLDNSDIR=	${ROOTOBJDIR}/lib/libldns
-LDLDNS?=	${LIBLDNSDIR}/libldns.so
 LIBLDNS?=	${LIBLDNSDIR}/libldns.a

 LIBSSHDIR=	${ROOTOBJDIR}/secure/lib/libssh
-LDSSH?=		${LIBSSHDIR}/libssh.so
 LIBSSH?=	${LIBSSHDIR}/libssh.a

 LIBUNBOUNDDIR=	${ROOTOBJDIR}/lib/libunbound
-LDUNBOUND?=	${LIBUNBOUNDDIR}/libunbound.so
 LIBUNBOUND?=	${LIBUNBOUNDDIR}/libunbound.a

 LIBUCLDIR=	${ROOTOBJDIR}/lib/libucl
-LDUCL?=		${LIBUCLDIR}/libucl.so
 LIBUCL?=	${LIBUCLDIR}/libucl.a

 LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
-LDREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a

 LIBOHASHDIR=	${ROOTOBJDIR}/lib/libohash
-LDOHASH?=	${LIBOHASHDIR}/libohash.a
 LIBOHASH?=	${LIBOHASHDIR}/libohash.a

 LIBSQLITE3DIR=	${ROOTOBJDIR}/lib/libsqlite3
-LDSQLITE3?=	${LIBSQLITE3DIR}/libsqlite3.so
 LIBSQLITE3?=	${LIBSQLITE3DIR}/libsqlite3.a

 LIBMANDOCDIR=	${ROOTOBJDIR}/lib/libmandoc
 LIBMANDOC?=	${LIBMANDOCDIR}/libmandoc.a

 LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
-LDSM?=		${LIBSMDIR}/libsm.a
 LIBSM?=		${LIBSMDIR}/libsm.a

 LIBSMDBDIR=	${ROOTOBJDIR}/lib/libsmdb
@ -372,3 +369,4 @@ LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools.a

 LIBAMUDIR=	${ROOTOBJDIR}/usr.sbin/amd/libamu
 LIBAMU?=	${LIBAMUDIR}/libamu/libamu.a
+
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
@ -5274,7 +5274,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz,
 	ARCSTAT_INCR(arcstat_l2_write_bytes, write_asize);
 	ARCSTAT_INCR(arcstat_l2_size, write_sz);
 	ARCSTAT_INCR(arcstat_l2_asize, write_asize);
-	vdev_space_update(dev->l2ad_vdev, write_psize, 0, 0);
+	vdev_space_update(dev->l2ad_vdev, write_asize, 0, 0);

 	/*
 	 * Bump device hand to the device start if it is approaching the end.
--- a/sys/dev/ahci/ahci_pci.c
+++ b/sys/dev/ahci/ahci_pci.c
@ -148,6 +148,14 @@ static struct {
 	{0x8c078086, 0x00, "Intel Lynx Point (RAID)",	0},
 	{0x8c0e8086, 0x00, "Intel Lynx Point (RAID)",	0},
 	{0x8c0f8086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8c828086, 0x00, "Intel Wildcat Point",	0},
+	{0x8c838086, 0x00, "Intel Wildcat Point",	0},
+	{0x8c848086, 0x00, "Intel Wildcat Point (RAID)",	0},
+	{0x8c858086, 0x00, "Intel Wildcat Point (RAID)",	0},
+	{0x8c868086, 0x00, "Intel Wildcat Point (RAID)",	0},
+	{0x8c878086, 0x00, "Intel Wildcat Point (RAID)",	0},
+	{0x8c8e8086, 0x00, "Intel Wildcat Point (RAID)",	0},
+	{0x8c8f8086, 0x00, "Intel Wildcat Point (RAID)",	0},
 	{0x8d028086, 0x00, "Intel Wellsburg",	0},
 	{0x8d048086, 0x00, "Intel Wellsburg (RAID)",	0},
 	{0x8d068086, 0x00, "Intel Wellsburg (RAID)",	0},
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@ -275,6 +275,19 @@ struct ata_pci_controller {
 #define ATA_LPT_R5		0x8c0e8086
 #define ATA_LPT_R6		0x8c0f8086

+#define ATA_WCPT_S1		0x8c808086
+#define ATA_WCPT_S2		0x8c818086
+#define ATA_WCPT_AH1		0x8c828086
+#define ATA_WCPT_AH2		0x8c838086
+#define ATA_WCPT_R1		0x8c848086
+#define ATA_WCPT_R2		0x8c858086
+#define ATA_WCPT_R3		0x8c868086
+#define ATA_WCPT_R4		0x8c878086
+#define ATA_WCPT_S3		0x8c888086
+#define ATA_WCPT_S4		0x8c898086
+#define ATA_WCPT_R5		0x8c8e8086
+#define ATA_WCPT_R6		0x8c8f8086
+
 #define ATA_WELLS_S1		0x8d008086
 #define ATA_WELLS_S2		0x8d088086
 #define ATA_WELLS_S3		0x8d608086
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@ -227,6 +227,18 @@ ata_intel_probe(device_t dev)
     { ATA_LPT_S4,       0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point" },
     { ATA_LPT_R5,       0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
     { ATA_LPT_R6,       0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
+     { ATA_WCPT_S1,      0, INTEL_6CH,  0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_S2,      0, INTEL_6CH,  0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_AH1,     0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_AH2,     0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_R1,      0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_R2,      0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_R3,      0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_R4,      0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_S3,      0, INTEL_6CH2, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_S4,      0, INTEL_6CH2, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_R5,      0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
+     { ATA_WCPT_R6,      0, INTEL_AHCI, 0, ATA_SA300, "Wildcat Point" },
     { ATA_WELLS_S1,     0, INTEL_6CH,  0, ATA_SA300, "Wellsburg" },
     { ATA_WELLS_S2,     0, INTEL_6CH2, 0, ATA_SA300, "Wellsburg" },
     { ATA_WELLS_S3,     0, INTEL_6CH,  0, ATA_SA300, "Wellsburg" },
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$");
 #define ID_AVOTON			0x1f3c8086
 #define ID_COLETOCRK			0x23B08086 
 #define ID_LPT				0x8c228086
+#define ID_WCPT				0x8ca28086

 #define PCIS_SERIALBUS_SMBUS_PROGIF	0x00

@ -197,6 +198,9 @@ ichsmb_pci_probe(device_t dev)
 	case ID_LPT:
 		device_set_desc(dev, "Intel Lynx Point SMBus controller");
 		break;
+	case ID_WCPT:
+		device_set_desc(dev, "Intel Wildcat Point SMBus controller");
+		break;
 	case ID_COLETOCRK:
 		device_set_desc(dev, "Intel Coleto Creek SMBus controller");
 		break;
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@ -194,6 +194,9 @@ static struct ichwd_device ichwd_devices[] = {
 	{ DEVICEID_LPT0,     "Intel Lynx Point watchdog timer",		10 },
 	{ DEVICEID_LPT1,     "Intel Lynx Point watchdog timer",		10 },
 	{ DEVICEID_LPT2,     "Intel Lynx Point watchdog timer",		10 },
+	{ DEVICEID_WCPT2,    "Intel Wildcat Point watchdog timer",	10 },
+	{ DEVICEID_WCPT4,    "Intel Wildcat Point watchdog timer",	10 },
+	{ DEVICEID_WCPT6,    "Intel Wildcat Point watchdog timer",	10 },
 	{ DEVICEID_DH89XXCC_LPC,  "Intel DH89xxCC watchdog timer",	10 },
 	{ DEVICEID_COLETOCRK_LPC, "Intel Coleto Creek watchdog timer",  10 },
 	{ 0, NULL, 0 },
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@ -210,6 +210,9 @@ struct ichwd_softc {
 #define DEVICEID_LPT29		0x8c5d
 #define DEVICEID_LPT30		0x8c5e
 #define DEVICEID_LPT31		0x8c5f
+#define DEVICEID_WCPT2		0x8cc2
+#define DEVICEID_WCPT4		0x8cc4
+#define DEVICEID_WCPT6		0x8cc6

 /* ICH LPC Interface Bridge Registers (ICH5 and older) */
 #define ICH_GEN_STA		0xd4
--- a/sys/dev/isp/isp_library.c
+++ b/sys/dev/isp/isp_library.c
@ -2369,7 +2369,7 @@ isp_find_pdb_by_wwn(ispsoftc_t *isp, int chan, uint64_t wwn, fcportdb_t **lptr)

 	if (chan < isp->isp_nchan) {
 		fcp = FCPARAM(isp, chan);
-		for (i = 0; i < MAX_FC_TARG; i++) {
+		for (i = MAX_FC_TARG - 1; i >= 0; i--) {
 			fcportdb_t *lp = &fcp->portdb[i];

 			if (lp->target_mode == 0) {
@ -2392,7 +2392,7 @@ isp_find_pdb_by_loopid(ispsoftc_t *isp, int chan, uint32_t loopid, fcportdb_t **

 	if (chan < isp->isp_nchan) {
 		fcp = FCPARAM(isp, chan);
-		for (i = 0; i < MAX_FC_TARG; i++) {
+		for (i = MAX_FC_TARG - 1; i >= 0; i--) {
 			fcportdb_t *lp = &fcp->portdb[i];

 			if (lp->target_mode == 0) {
@ -2418,7 +2418,7 @@ isp_find_pdb_by_sid(ispsoftc_t *isp, int chan, uint32_t sid, fcportdb_t **lptr)
 	}

 	fcp = FCPARAM(isp, chan);
-	for (i = 0; i < MAX_FC_TARG; i++) {
+	for (i = MAX_FC_TARG - 1; i >= 0; i--) {
 		fcportdb_t *lp = &fcp->portdb[i];

 		if (lp->target_mode == 0) {
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@ -86,6 +86,7 @@ static const struct {
 	{ HDA_INTEL_PPT1,    "Intel Panther Point",	0, 0 },
 	{ HDA_INTEL_LPT1,    "Intel Lynx Point",	0, 0 },
 	{ HDA_INTEL_LPT2,    "Intel Lynx Point",	0, 0 },
+	{ HDA_INTEL_WCPT,    "Intel Wildcat Point",	0, 0 },
 	{ HDA_INTEL_WELLS1,  "Intel Wellsburg",	0, 0 },
 	{ HDA_INTEL_WELLS2,  "Intel Wellsburg",	0, 0 },
 	{ HDA_INTEL_LPTLP1,  "Intel Lynx Point-LP",	0, 0 },
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@ -62,6 +62,7 @@
 #define HDA_INTEL_SCH		HDA_MODEL_CONSTRUCT(INTEL, 0x811b)
 #define HDA_INTEL_LPT1		HDA_MODEL_CONSTRUCT(INTEL, 0x8c20)
 #define HDA_INTEL_LPT2		HDA_MODEL_CONSTRUCT(INTEL, 0x8c21)
+#define HDA_INTEL_WCPT		HDA_MODEL_CONSTRUCT(INTEL, 0x8ca0)
 #define HDA_INTEL_WELLS1	HDA_MODEL_CONSTRUCT(INTEL, 0x8d20)
 #define HDA_INTEL_WELLS2	HDA_MODEL_CONSTRUCT(INTEL, 0x8d21)
 #define HDA_INTEL_LPTLP1	HDA_MODEL_CONSTRUCT(INTEL, 0x9c20)
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@ -127,6 +127,7 @@ static const struct pci_id pci_ns8250_ids[] = {
 { 0x8086, 0x8813, 0xffff, 0, "Intel EG20T Serial Port 2", 0x10 },
 { 0x8086, 0x8814, 0xffff, 0, "Intel EG20T Serial Port 3", 0x10 },
 { 0x8086, 0x8c3d, 0xffff, 0, "Intel Lynx Point KT Controller", 0x10 },
+{ 0x8086, 0x8cbd, 0xffff, 0, "Intel Wildcat Point KT Controller", 0x10 },
 { 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 },
 { 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 },
 { 0x9710, 0x9865, 0xa000, 0x1000, "NetMos NM9865 Serial Port", 0x10 },
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@ -164,6 +164,10 @@ ehci_pci_match(device_t self)
 		return ("Intel Lynx Point USB 2.0 controller USB-A");
 	case 0x8c2d8086:
 		return ("Intel Lynx Point USB 2.0 controller USB-B");
+	case 0x8ca68086:
+		return ("Intel Wildcat Point USB 2.0 controller USB-A");
+	case 0x8cad8086:
+		return ("Intel Wildcat Point USB 2.0 controller USB-B");

 	case 0x00e01033:
 		return ("NEC uPD 720100 USB 2.0 controller");
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@ -109,6 +109,8 @@ xhci_pci_match(device_t self)
 		return ("Intel Panther Point USB 3.0 controller");
 	case 0x8c318086:
 		return ("Intel Lynx Point USB 3.0 controller");
+	case 0x8cb18086:
+		return ("Intel Wildcat Point USB 3.0 controller");

 	default:
 		break;
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@ -253,6 +253,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
 	USB_QUIRK(LEXAR, CF_READER, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY),
 	USB_QUIRK(LEXAR, JUMPSHOT, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI),
+	USB_QUIRK(LEXAR, JUMPDRIVE, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY),
 	USB_QUIRK(LOGITEC, LDR_H443SU2, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI),
 	USB_QUIRK(LOGITEC, LDR_H443U2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI,),
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@ -2604,6 +2604,7 @@ product LENOVO ETHERNET		0x7203	USB 2.0 Ethernet
 /* Lexar products */
 product LEXAR JUMPSHOT		0x0001	jumpSHOT CompactFlash Reader
 product LEXAR CF_READER		0xb002	USB CF Reader
+product LEXAR JUMPDRIVE		0xa833	USB Jumpdrive Flash Drive

 /* Lexmark products */
 product LEXMARK S2450		0x0009	Optra S 2450
--- a/tools/tools/ath/athaggrstats/Makefile
+++ b/tools/tools/ath/athaggrstats/Makefile
@ -12,8 +12,7 @@ CLEANFILES+=	opt_ah.h

 CFLAGS+=-DATH_SUPPORT_ANI
 CFLAGS+=-DATH_SUPPORT_TDMA
-USEPRIVATELIB=  bsdstat
-LDADD=	${LDBSDSTAT}
+LIBADD+=	bsdstat

 opt_ah.h:
 	echo "#define AH_DEBUG 1" > opt_ah.h
--- a/tools/tools/ath/athstats/Makefile
+++ b/tools/tools/ath/athstats/Makefile
@ -23,9 +23,7 @@ CFLAGS+=-DATH_SUPPORT_TDMA

 CFLAGS.clang+= -fbracket-depth=512

-USEPRIVATELIB=	bsdstat
-
-LDADD=	${LDBSDSTAT}
+LIBADD=	bsdstat

 opt_ah.h:
 	echo "#define AH_DEBUG 1" > opt_ah.h
--- a/tools/tools/mwl/mwlstats/Makefile
+++ b/tools/tools/mwl/mwlstats/Makefile
@ -5,8 +5,7 @@ BINDIR=	/usr/local/bin
 MAN=

 SRCS=	main.c mwlstats.c
-USEPRIVATELIB=
-LDADD=-lbsdstat
+LIBADD=	bsdstat

 .include <bsd.prog.mk>

--- a/tools/tools/net80211/wlanstats/Makefile
+++ b/tools/tools/net80211/wlanstats/Makefile
@ -5,8 +5,7 @@
 PROG=	wlanstats
 BINDIR=	/usr/local/bin
 MAN=
-USEPRIVATELIB=  bsdstat
-LDADD=  ${LDBSDSTAT}
+LIBADD=	bsdstat

 SRCS=	wlanstats.c main.c

--- a/tools/tools/npe/npestats/Makefile
+++ b/tools/tools/npe/npestats/Makefile
@ -4,7 +4,6 @@ PROG=	npestats
 SRCS=	main.c npestats.c
 BINDIR=	/usr/local/bin
 MAN=
-USEPRIVATELIB=
-LDADD=	-lbsdstat
+LIBADD=	bsdstat

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@ -39,18 +39,14 @@ LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z magic crypto ssl pthread

 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
 	${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
 	${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
 	${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
-	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 CLEANFILES+=	svnlite.1
 .if(defined(ORGANIZATION) && !empty(ORGANIZATION))
--- a/usr.bin/svn/svnadmin/Makefile
+++ b/usr.bin/svn/svnadmin/Makefile
@ -25,15 +25,11 @@ LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z pthread

 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
-
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svndumpfilter/Makefile
+++ b/usr.bin/svn/svndumpfilter/Makefile
@ -25,14 +25,11 @@ LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z crypt pthread

 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svnlook/Makefile
+++ b/usr.bin/svn/svnlook/Makefile
@ -26,14 +26,11 @@ LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z pthread

 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svnmucc/Makefile
+++ b/usr.bin/svn/svnmucc/Makefile
@ -31,16 +31,12 @@ LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z crypto ssl pthread

 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \
 	${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \
 	${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \
-	${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} \
-	${LIBCRYPT} ${LIBMAGIC} ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR_UTIL} ${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svnrdump/Makefile
+++ b/usr.bin/svn/svnrdump/Makefile
@ -33,17 +33,13 @@ LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z crypto ssl pthread

 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
 	${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
 	${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
 	${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
-	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svnserve/Makefile
+++ b/usr.bin/svn/svnserve/Makefile
@ -30,16 +30,12 @@ LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD=	bsdxml sqlite3 z pthread

 DPADD=	${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
 	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
-	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svnsync/Makefile
+++ b/usr.bin/svn/svnsync/Makefile
@ -30,16 +30,12 @@ LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD=	bsdxml sqlite3 z crypto ssl pthread

 DPADD=	${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
 	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
-	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
-	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBAPR}

 .include <bsd.prog.mk>
--- a/usr.bin/svn/svnversion/Makefile
+++ b/usr.bin/svn/svnversion/Makefile
@ -23,14 +23,10 @@ LDADD=	-L${LIBSVN_WCDIR} -lsvn_wc \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBAPR_UTILDIR} -lapr-util \
-	-lbsdxml \
-	-L${LIBAPRDIR} -lapr \
-	${LDSQLITE3} \
-	-lz -lcrypt -lpthread
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z pthread

 DPADD=	${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
-	${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} \
-	${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
-USEPRIVATELIB=	sqlite3
+	${LIBSERF} ${LIBAPR_UTIL}${LIBAPR}

 .include <bsd.prog.mk>