PERFORCE change 131742 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=131742

Change 131742 by peter at peter_overcee on 2007/12/27 00:09:30

	Tidy up some loose ends with libnames.  Avoid conflicting with
	the libraries of the ports version of svn.

Affected files ...

.. //depot/projects/hammer/share/mk/bsd.libnames.mk#37 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svn/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#2 edit

Differences ...

==== //depot/projects/hammer/share/mk/bsd.libnames.mk#37 (text+ko) ====

@@ -150,3 +150,26 @@
 LIBZ?=		${DESTDIR}${LIBDIR}/libz.a
 LIBZFS?=	${DESTDIR}${LIBDIR}/libzfs.a
 LIBZPOOL?=	${DESTDIR}${LIBDIR}/libzpool.a
+
+LIBBSDAPR?=		${DESTDIR}${LIBDIR}/libbsdapr.a
+LIBBSDAPR-UTIL?=	${DESTDIR}${LIBDIR}/libbsdapr-util.a
+LIBBSDDAV?=		${DESTDIR}${LIBDIR}/libbsddav.a
+
+LIBBSDSVN_CLIENT?=	${DESTDIR}${LIBDIR}/libbsdsvn_client.a
+LIBBSDSVN_DELTA?=	${DESTDIR}${LIBDIR}/libbsdsvn_delta.a
+LIBBSDSVN_DIFF?=	${DESTDIR}${LIBDIR}/libbsdsvn_diff.a
+LIBBSDSVN_FS?=		${DESTDIR}${LIBDIR}/libbsdsvn_fs.a
+LIBBSDSVN_FS_FS?=	${DESTDIR}${LIBDIR}/libbsdsvn_fs_fs.a
+LIBBSDSVN_RA?=		${DESTDIR}${LIBDIR}/libbsdsvn_ra.a
+LIBBSDSVN_CLIENT?=	${DESTDIR}${LIBDIR}/libbsdsvn_client.a
+LIBBSDSVN_DELTA?=	${DESTDIR}${LIBDIR}/libbsdsvn_delta.a
+LIBBSDSVN_DIFF?=	${DESTDIR}${LIBDIR}/libbsdsvn_diff.a
+LIBBSDSVN_FS?=		${DESTDIR}${LIBDIR}/libbsdsvn_fs.a
+LIBBSDSVN_FS_FS?=	${DESTDIR}${LIBDIR}/libbsdsvn_fs_fs.a
+LIBBSDSVN_RA?=		${DESTDIR}${LIBDIR}/libbsdsvn_ra.a
+LIBBSDSVN_RA_DAV?=	${DESTDIR}${LIBDIR}/libbsdsvn_ra_dav.a
+LIBBSDSVN_RA_LOCAL?=	${DESTDIR}${LIBDIR}/libbsdsvn_ra_local.a
+LIBBSDSVN_RA_SVN?=	${DESTDIR}${LIBDIR}/libbsdsvn_ra_svn.a
+LIBBSDSVN_REPOS?=	${DESTDIR}${LIBDIR}/libbsdsvn_repos.a
+LIBBSDSVN_SUBR?=	${DESTDIR}${LIBDIR}/libbsdsvn_subr.a
+LIBBSDSVN_WC?=		${DESTDIR}${LIBDIR}/libbsdsvn_wc.a

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_client
 
-LIB=		svn_client
+LIB=		bsdsvn_client
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_delta
 
-LIB=		svn_delta
+LIB=		bsdsvn_delta
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_diff
 
-LIB=		svn_diff
+LIB=		bsdsvn_diff
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_fs
 
-LIB=		svn_fs
+LIB=		bsdsvn_fs
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_fs_fs
 
-LIB=		svn_fs_fs
+LIB=		bsdsvn_fs_fs
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_ra
 
-LIB=		svn_ra
+LIB=		bsdsvn_ra
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_ra_dav
 
-LIB=		svn_ra_dav
+LIB=		bsdsvn_ra_dav
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_ra_local
 
-LIB=		svn_ra_local
+LIB=		bsdsvn_ra_local
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_ra_svn
 
-LIB=		svn_ra_svn
+LIB=		bsdsvn_ra_svn
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_repos
 
-LIB=		svn_repos
+LIB=		bsdsvn_repos
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_subr
 
-LIB=		svn_subr
+LIB=		bsdsvn_subr
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 
 .PATH:	${SVNDIR}/libsvn_wc
 
-LIB=		svn_wc
+LIB=		bsdsvn_wc
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \

==== //depot/projects/hammer/usr.bin/svn/svn/Makefile#2 (text+ko) ====

@@ -18,12 +18,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt
 

==== //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#2 (text+ko) ====

@@ -12,12 +12,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt
 

==== //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#2 (text+ko) ====

@@ -12,12 +12,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt
 

==== //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#2 (text+ko) ====

@@ -12,12 +12,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt
 

==== //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#2 (text+ko) ====

@@ -12,12 +12,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt
 

==== //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#2 (text+ko) ====

@@ -12,12 +12,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt
 

==== //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#2 (text+ko) ====

@@ -12,12 +12,17 @@
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
 
-#DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-#LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
+	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \
+	${LIBBSDSVN_RA_DAV} ${LIBBSDSVN_RA_LOCAL} ${LIBBSDSVN_RA_SVN} \
+	${LIBBSDSVN_DELTA} ${LIBBSDSVN_DIFF} ${LIBBSDSVN_SUBR} \
+	${LIBBSDAPR-UTIL} ${LIBBSDAPR} ${LIBBSDDAV} ${LIBBSDXML} \
+	${LIBSSL} ${LIBCRYPTO} ${LIBZ} ${LIBCRYPT}
 
-LDADD=	-lsvn_client -lsvn_wc -lsvn_fs -lsvn_fs_fs -lsvn_repos \
-	-lsvn_ra -lsvn_ra_dav -lsvn_ra_local -lsvn_ra_svn \
-	-lsvn_delta -lsvn_diff -lsvn_subr \
+LDADD=	-lbsdsvn_client -lbsdsvn_wc -lbsdsvn_fs \
+	-lbsdsvn_fs_fs -lbsdsvn_repos -lbsdsvn_ra \
+	-lbsdsvn_ra_dav -lbsdsvn_ra_local -lbsdsvn_ra_svn \
+	-lbsdsvn_delta -lbsdsvn_diff -lbsdsvn_subr \
 	-lbsdapr-util -lbsdapr -lbsddav -lbsdxml \
 	-lssl -lcrypto -lz -lcrypt