Index: head/usr.bin/svn/Makefile.inc
===================================================================
--- head/usr.bin/svn/Makefile.inc	(revision 313678)
+++ head/usr.bin/svn/Makefile.inc	(revision 313679)
@@ -1,62 +1,60 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .if ${MK_SVN} == "yes"
 SVNLITE?=
 .else
 SVNLITE?=	lite
 .endif
 
 PACKAGE=	svn
 
 .if !defined(SVNDIR)
 
-SVNDIR=		${.CURDIR}/../../../contrib/subversion/subversion
-APRU=		${.CURDIR}/../../../contrib/apr-util
-APR=		${.CURDIR}/../../../contrib/apr
+SVNDIR=		${SRCTOP}/contrib/subversion/subversion
+APRU=		${SRCTOP}/contrib/apr-util
+APR=		${SRCTOP}/contrib/apr
 WARNS?=		0	# definitely not warns friendly
 
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
+.sinclude "${.CURDIR:H:H}/Makefile.inc"
 
-LIBAPRDIR=		${.OBJDIR}/../lib/libapr
-LIBAPR_UTILDIR=		${.OBJDIR}/../lib/libapr_util
-LIBSERFDIR=		${.OBJDIR}/../lib/libserf
+LIBAPRDIR=		${.OBJDIR:H}/lib/libapr
+LIBAPR_UTILDIR=		${.OBJDIR:H}/lib/libapr_util
+LIBSERFDIR=		${.OBJDIR:H}/lib/libserf
 
-LIBSVN_CLIENTDIR=	${.OBJDIR}/../lib/libsvn_client
-LIBSVN_DELTADIR=	${.OBJDIR}/../lib/libsvn_delta
-LIBSVN_DIFFDIR=		${.OBJDIR}/../lib/libsvn_diff
-LIBSVN_FSDIR=		${.OBJDIR}/../lib/libsvn_fs
-LIBSVN_FS_FSDIR=	${.OBJDIR}/../lib/libsvn_fs_fs
-LIBSVN_FS_UTILDIR=	${.OBJDIR}/../lib/libsvn_fs_util
-LIBSVN_FS_XDIR=		${.OBJDIR}/../lib/libsvn_fs_x
-LIBSVN_RADIR=		${.OBJDIR}/../lib/libsvn_ra
-LIBSVN_RA_LOCALDIR=	${.OBJDIR}/../lib/libsvn_ra_local
-LIBSVN_RA_SVNDIR=	${.OBJDIR}/../lib/libsvn_ra_svn
-LIBSVN_RA_SERFDIR=	${.OBJDIR}/../lib/libsvn_ra_serf
-LIBSVN_REPOSDIR=	${.OBJDIR}/../lib/libsvn_repos
-LIBSVN_SUBRDIR=		${.OBJDIR}/../lib/libsvn_subr
-LIBSVN_WCDIR=		${.OBJDIR}/../lib/libsvn_wc
+LIBSVN_CLIENTDIR=	${.OBJDIR:H}/lib/libsvn_client
+LIBSVN_DELTADIR=	${.OBJDIR:H}/lib/libsvn_delta
+LIBSVN_DIFFDIR=		${.OBJDIR:H}/lib/libsvn_diff
+LIBSVN_FSDIR=		${.OBJDIR:H}/lib/libsvn_fs
+LIBSVN_FS_FSDIR=	${.OBJDIR:H}/lib/libsvn_fs_fs
+LIBSVN_FS_UTILDIR=	${.OBJDIR:H}/lib/libsvn_fs_util
+LIBSVN_FS_XDIR=		${.OBJDIR:H}/lib/libsvn_fs_x
+LIBSVN_RADIR=		${.OBJDIR:H}/lib/libsvn_ra
+LIBSVN_RA_LOCALDIR=	${.OBJDIR:H}/lib/libsvn_ra_local
+LIBSVN_RA_SVNDIR=	${.OBJDIR:H}/lib/libsvn_ra_svn
+LIBSVN_RA_SERFDIR=	${.OBJDIR:H}/lib/libsvn_ra_serf
+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
 
 .endif
Index: head/usr.bin/svn/svn/Makefile
===================================================================
--- head/usr.bin/svn/svn/Makefile	(revision 313678)
+++ head/usr.bin/svn/svn/Makefile	(revision 313679)
@@ -1,67 +1,67 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svn
 
 PROG=	svn${SVNLITE}
 
 SRCS=	add-cmd.c auth-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 similarity.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 \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 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} \
 	${LIBAPR}
 
 CLEANFILES+=	svnlite.1
 .if(defined(ORGANIZATION) && !empty(ORGANIZATION))
 SRCS+=		freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h:
 	@echo "#define ORGANIZATION_NAME	\"$$(eval echo ${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 313678)
+++ head/usr.bin/svn/svnadmin/Makefile	(revision 313679)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnadmin
 
 PROG=	svn${SVNLITE}admin
 
 SRCS=	svnadmin.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnbench/Makefile
===================================================================
--- head/usr.bin/svn/svnbench/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnbench/Makefile	(revision 313679)
@@ -1,48 +1,48 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnbench
 
 PROG=	svn${SVNLITE}bench
 
 SRCS=	help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \
 	null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 
 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} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svndumpfilter/Makefile
===================================================================
--- head/usr.bin/svn/svndumpfilter/Makefile	(revision 313678)
+++ head/usr.bin/svn/svndumpfilter/Makefile	(revision 313679)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svndumpfilter
 
 PROG=	svn${SVNLITE}dumpfilter
 
 SRCS=	svndumpfilter.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 LIBADD+=	bsdxml sqlite3 z crypt pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnfsfs/Makefile
===================================================================
--- head/usr.bin/svn/svnfsfs/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnfsfs/Makefile	(revision 313679)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnfsfs
 
 PROG=	svn${SVNLITE}fsfs
 
 SRCS=	dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnlook/Makefile
===================================================================
--- head/usr.bin/svn/svnlook/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnlook/Makefile	(revision 313679)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnlook
 
 PROG=	svn${SVNLITE}look
 
 SRCS=	svnlook.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
 	${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnmucc/Makefile
===================================================================
--- head/usr.bin/svn/svnmucc/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnmucc/Makefile	(revision 313679)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnmucc
 
 PROG=	svn${SVNLITE}mucc
 
 SRCS=	svnmucc.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 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} ${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnrdump/Makefile
===================================================================
--- head/usr.bin/svn/svnrdump/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnrdump/Makefile	(revision 313679)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/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 \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 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} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnserve/Makefile
===================================================================
--- head/usr.bin/svn/svnserve/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnserve/Makefile	(revision 313679)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnserve
 
 PROG=	svn${SVNLITE}serve
 
 SRCS=	cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 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} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnsync/Makefile
===================================================================
--- head/usr.bin/svn/svnsync/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnsync/Makefile	(revision 313679)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/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 \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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_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
 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} \
 	${LIBAPR}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svnversion/Makefile
===================================================================
--- head/usr.bin/svn/svnversion/Makefile	(revision 313678)
+++ head/usr.bin/svn/svnversion/Makefile	(revision 313679)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 MAN=
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "${.CURDIR:H}/Makefile.inc"
 
 .PATH:	${SVNDIR}/svnversion
 
 PROG=	svn${SVNLITE}version
 
 SRCS=	svnversion.c
 
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${.CURDIR}/../lib/libapr \
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
+	-I${.CURDIR:H}/lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
-	-I${.CURDIR}/../lib/libapr_util \
+	-I${.CURDIR:H}/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 \
 	-L${LIBAPRDIR} -lapr
 LIBADD+=	bsdxml sqlite3 z pthread
 
 DPADD=	${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
 	${LIBSERF} ${LIBAPR_UTIL} ${LIBAPR}
 
 .include <bsd.prog.mk>