Index: head/usr.bin/svn/svn/Makefile
===================================================================
--- head/usr.bin/svn/svn/Makefile	(revision 275078)
+++ head/usr.bin/svn/svn/Makefile	(revision 275079)
@@ -1,69 +1,65 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svn
 
 PROG=	svn${SVNLITE}
 
 SRCS=	add-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c checkout-cmd.c \
 	cl-conflicts.c cleanup-cmd.c commit-cmd.c conflict-callbacks.c \
 	copy-cmd.c delete-cmd.c deprecated.c diff-cmd.c export-cmd.c \
 	file-merge.c help-cmd.c import-cmd.c info-cmd.c list-cmd.c \
 	lock-cmd.c log-cmd.c merge-cmd.c mergeinfo-cmd.c mkdir-cmd.c \
 	move-cmd.c notify.c patch-cmd.c propdel-cmd.c propedit-cmd.c \
 	propget-cmd.c proplist-cmd.c props.c propset-cmd.c relocate-cmd.c \
 	resolve-cmd.c resolved-cmd.c revert-cmd.c status-cmd.c status.c \
 	svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c 
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_WCDIR} -lsvn_wc \
 	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
 	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
 	-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))
 DPSRCS+=	freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h:
 	@echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \
 	    > freebsd-organization.h
 .endif
 
 svnlite.1: svn.1
 	# Avoid the website
 	sed -E 's,(^| |B|`)svn,\1svnlite,g' ${SVNDIR}/svn/svn.1 > ${.OBJDIR}/svnlite.1
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnadmin/Makefile
===================================================================
--- head/usr.bin/svn/svnadmin/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnadmin/Makefile	(revision 275079)
@@ -1,39 +1,35 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnadmin
 
 PROG=	svn${SVNLITE}admin
 
 SRCS=	svnadmin.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-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>
Index: head/usr.bin/svn/svndumpfilter/Makefile
===================================================================
--- head/usr.bin/svn/svndumpfilter/Makefile	(revision 275078)
+++ head/usr.bin/svn/svndumpfilter/Makefile	(revision 275079)
@@ -1,38 +1,35 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svndumpfilter
 
 PROG=	svn${SVNLITE}dumpfilter
 
 SRCS=	svndumpfilter.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-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>
Index: head/usr.bin/svn/svnlook/Makefile
===================================================================
--- head/usr.bin/svn/svnlook/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnlook/Makefile	(revision 275079)
@@ -1,39 +1,36 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnlook
 
 PROG=	svn${SVNLITE}look
 
 SRCS=	svnlook.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-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>
Index: head/usr.bin/svn/svnmucc/Makefile
===================================================================
--- head/usr.bin/svn/svnmucc/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnmucc/Makefile	(revision 275079)
@@ -1,46 +1,42 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnmucc
 
 PROG=	svn${SVNLITE}mucc
 
 SRCS=	svnmucc.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
 	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-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>
Index: head/usr.bin/svn/svnrdump/Makefile
===================================================================
--- head/usr.bin/svn/svnrdump/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnrdump/Makefile	(revision 275079)
@@ -1,49 +1,45 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnrdump
 
 PROG=	svn${SVNLITE}rdump
 
 SRCS=	dump_editor.c load_editor.c svnrdump.c util.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_WCDIR} -lsvn_wc \
 	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
 	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
 	-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>
Index: head/usr.bin/svn/svnserve/Makefile
===================================================================
--- head/usr.bin/svn/svnserve/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnserve/Makefile	(revision 275079)
@@ -1,45 +1,41 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnserve
 
 PROG=	svn${SVNLITE}serve
 
 SRCS=	cyrus_auth.c log-escape.c serve.c svnserve.c winservice.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
 	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-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>
Index: head/usr.bin/svn/svnsync/Makefile
===================================================================
--- head/usr.bin/svn/svnsync/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnsync/Makefile	(revision 275079)
@@ -1,45 +1,41 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnsync
 
 PROG=	svn${SVNLITE}sync
 
 SRCS=	svnsync.c sync.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
 	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-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>
Index: head/usr.bin/svn/svnversion/Makefile
===================================================================
--- head/usr.bin/svn/svnversion/Makefile	(revision 275078)
+++ head/usr.bin/svn/svnversion/Makefile	(revision 275079)
@@ -1,36 +1,32 @@
 # $FreeBSD$
 
 MAN=
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svnversion
 
 PROG=	svn${SVNLITE}version
 
 SRCS=	svnversion.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_WCDIR} -lsvn_wc \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-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>