svn: support building with WITH_PIE

Subversion builds and links against its own .a archives using local
rules, so did not benefit from with the WITH_PIE library support added
in r344179.  Apply the same _pie suffix locally.

Reviewed by:	cem
Differential Revision:	https://reviews.freebsd.org/D19246

12 files changed, 160 insertions, 159 deletions

diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
index 32eee3399ceb..8a6458fc0419 100644
--- a/usr.bin/svn/Makefile.inc
+++ b/usr.bin/svn/Makefile.inc
@@ -2,13 +2,14 @@
 
 .include <src.opts.mk>
 
-MK_PIE:=	no	# Explicit libXXX.a references
-
 .if ${MK_SVN} == "yes"
 SVNLITE?=
 .else
 SVNLITE?=	lite
 .endif
+.if ${MK_PIE} != "no"
+PIE_SUFFIX=		_pie
+.endif
 
 PACKAGE=	svn
 
@@ -40,23 +41,23 @@ LIBSVN_REPOSDIR=	${.OBJDIR:H}/lib/libsvn_repos
 LIBSVN_SUBRDIR=		${.OBJDIR:H}/lib/libsvn_subr
 LIBSVN_WCDIR=		${.OBJDIR:H}/lib/libsvn_wc
 
-LIBAPR=			${LIBAPRDIR}/libapr.a
-LIBAPR_UTIL=		${LIBAPR_UTILDIR}/libapr-util.a
-LIBSERF=		${LIBSERFDIR}/libserf.a
-
-LIBSVN_CLIENT=		${LIBSVN_CLIENTDIR}/libsvn_client.a
-LIBSVN_DELTA=		${LIBSVN_DELTADIR}/libsvn_delta.a
-LIBSVN_DIFF=		${LIBSVN_DIFFDIR}/libsvn_diff.a
-LIBSVN_FS=		${LIBSVN_FSDIR}/libsvn_fs.a
-LIBSVN_FS_FS=		${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a
-LIBSVN_FS_UTIL=		${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a
-LIBSVN_FS_X=		${LIBSVN_FS_XDIR}/libsvn_fs_x.a
-LIBSVN_RA=		${LIBSVN_RADIR}/libsvn_ra.a
-LIBSVN_RA_LOCAL=	${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a
-LIBSVN_RA_SVN=		${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a
-LIBSVN_RA_SERF=		${LIBSVN_RA_SERFDIR}/libsvn_ra_serf.a
-LIBSVN_REPOS=		${LIBSVN_REPOSDIR}/libsvn_repos.a
-LIBSVN_SUBR=		${LIBSVN_SUBRDIR}/libsvn_subr.a
-LIBSVN_WC=		${LIBSVN_WCDIR}/libsvn_wc.a
+LIBAPR=			${LIBAPRDIR}/libapr${PIE_SUFFIX}.a
+LIBAPR_UTIL=		${LIBAPR_UTILDIR}/libapr-util${PIE_SUFFIX}.a
+LIBSERF=		${LIBSERFDIR}/libserf${PIE_SUFFIX}.a
+
+LIBSVN_CLIENT=		${LIBSVN_CLIENTDIR}/libsvn_client${PIE_SUFFIX}.a
+LIBSVN_DELTA=		${LIBSVN_DELTADIR}/libsvn_delta${PIE_SUFFIX}.a
+LIBSVN_DIFF=		${LIBSVN_DIFFDIR}/libsvn_diff${PIE_SUFFIX}.a
+LIBSVN_FS=		${LIBSVN_FSDIR}/libsvn_fs${PIE_SUFFIX}.a
+LIBSVN_FS_FS=		${LIBSVN_FS_FSDIR}/libsvn_fs_fs${PIE_SUFFIX}.a
+LIBSVN_FS_UTIL=		${LIBSVN_FS_UTILDIR}/libsvn_fs_util${PIE_SUFFIX}.a
+LIBSVN_FS_X=		${LIBSVN_FS_XDIR}/libsvn_fs_x${PIE_SUFFIX}.a
+LIBSVN_RA=		${LIBSVN_RADIR}/libsvn_ra${PIE_SUFFIX}.a
+LIBSVN_RA_LOCAL=	${LIBSVN_RA_LOCALDIR}/libsvn_ra_local${PIE_SUFFIX}.a
+LIBSVN_RA_SVN=		${LIBSVN_RA_SVNDIR}/libsvn_ra_svn${PIE_SUFFIX}.a
+LIBSVN_RA_SERF=		${LIBSVN_RA_SERFDIR}/libsvn_ra_serf${PIE_SUFFIX}.a
+LIBSVN_REPOS=		${LIBSVN_REPOSDIR}/libsvn_repos${PIE_SUFFIX}.a
+LIBSVN_SUBR=		${LIBSVN_SUBRDIR}/libsvn_subr${PIE_SUFFIX}.a
+LIBSVN_WC=		${LIBSVN_WCDIR}/libsvn_wc${PIE_SUFFIX}.a
 
 .endif
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index 261ed25f606f..a9f57cce2f22 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -26,23 +26,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+	-L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+	-L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z magic crypto ssl pthread
 
 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile
index eab3b2c89be9..8fe3dfc15d4c 100644
--- a/usr.bin/svn/svnadmin/Makefile
+++ b/usr.bin/svn/svnadmin/Makefile
@@ -18,15 +18,15 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
-	-L${LIBSVN_DELTADIR} -lsvn_delta \
-	-L${LIBSVN_SUBRDIR} -lsvn_subr \
-	-L${LIBAPR_UTILDIR} -lapr-util \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
diff --git a/usr.bin/svn/svnbench/Makefile b/usr.bin/svn/svnbench/Makefile
index 8fe07d7f40c5..728de8802d7f 100644
--- a/usr.bin/svn/svnbench/Makefile
+++ b/usr.bin/svn/svnbench/Makefile
@@ -19,23 +19,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+	-L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+	-L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 
 LIBADD+=	bsdxml sqlite3 z magic crypto ssl pthread
 
diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile
index ccb54eb35f19..113a004a6784 100644
--- a/usr.bin/svn/svndumpfilter/Makefile
+++ b/usr.bin/svn/svndumpfilter/Makefile
@@ -18,15 +18,15 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
-	-L${LIBSVN_DELTADIR} -lsvn_delta \
-	-L${LIBSVN_SUBRDIR} -lsvn_subr \
-	-L${LIBAPR_UTILDIR} -lapr-util \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z crypt pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
diff --git a/usr.bin/svn/svnfsfs/Makefile b/usr.bin/svn/svnfsfs/Makefile
index 2a465b6038b4..f5c6da38ccec 100644
--- a/usr.bin/svn/svnfsfs/Makefile
+++ b/usr.bin/svn/svnfsfs/Makefile
@@ -18,15 +18,15 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
-	-L${LIBSVN_DELTADIR} -lsvn_delta \
-	-L${LIBSVN_SUBRDIR} -lsvn_subr \
-	-L${LIBAPR_UTILDIR} -lapr-util \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile
index b4c3929bfbb0..4e631c2e6ca8 100644
--- a/usr.bin/svn/svnlook/Makefile
+++ b/usr.bin/svn/svnlook/Makefile
@@ -18,16 +18,16 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile
index f2bd597aafd3..fba151bfa91a 100644
--- a/usr.bin/svn/svnmucc/Makefile
+++ b/usr.bin/svn/svnmucc/Makefile
@@ -18,23 +18,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+	-L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+	-L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z crypto ssl pthread
 
 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \
diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile
index f1dd5e7e16d4..66aaea3180fb 100644
--- a/usr.bin/svn/svnrdump/Makefile
+++ b/usr.bin/svn/svnrdump/Makefile
@@ -18,23 +18,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+	-L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+	-L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z crypto ssl pthread
 
 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile
index 5e2c79cd37c3..34e348092058 100644
--- a/usr.bin/svn/svnserve/Makefile
+++ b/usr.bin/svn/svnserve/Makefile
@@ -18,20 +18,20 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile
index 7867611cf6e2..7bfefdc78132 100644
--- a/usr.bin/svn/svnsync/Makefile
+++ b/usr.bin/svn/svnsync/Makefile
@@ -18,20 +18,20 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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_XDIR} -lsvn_fs_x \
-	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+	-L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD=	bsdxml sqlite3 z crypto ssl pthread
 
 DPADD=	${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile
index 29e5b339f6bf..d620ba42abfb 100644
--- a/usr.bin/svn/svnversion/Makefile
+++ b/usr.bin/svn/svnversion/Makefile
@@ -18,12 +18,12 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
 	-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 \
-	-L${LIBAPRDIR} -lapr
+LDADD=	-L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+	-L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+	-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+	-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \