diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index fa313fc8b68..3bb0d8b1397 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2005/11/30 19:45:07 sturm Exp $
+# $OpenBSD: Makefile,v 1.16 2006/01/07 01:10:11 steven Exp $
 
 COMMENT=	"subversion revision control system"
 COMMENT-perl=	"perl interface to subversion"
@@ -9,6 +9,22 @@ DISTNAME=	subversion-${VERSION}
 PKGNAME=	${DISTNAME}p1
 PKGNAME-perl=	p5-SVN-${VERSION}
 PKGNAME-python=	py-subversion-${VERSION}
+SHARED_LIBS=	svn_client-1	0.0	\
+		svn_delta-1	0.0	\
+		svn_diff-1	0.0	\
+		svn_fs-1	0.0	\
+		svn_fs_base-1	0.0	\
+		svn_fs_fs-1	0.0	\
+		svn_ra-1	0.0	\
+		svn_ra_dav-1	0.0	\
+		svn_ra_local-1	0.0	\
+		svn_ra_svn-1	0.0	\
+		svn_repos-1	0.0	\
+		svn_subr-1	0.0	\
+		svn_swig_perl-1	0.0	\
+		svn_swig_py-1	0.0	\
+		svn_wc-1	0.0
+
 CATEGORIES=	devel
 
 HOMEPAGE=	http://subversion.tigris.org/
@@ -97,18 +113,24 @@ pre-build:
 
 .if !${FLAVOR:L:Mno_bindings}
 post-build: 
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} swig-py
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} swig-pl
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${MAKE_FLAGS} swig-py
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${MAKE_FLAGS} swig-pl
 
 post-regress:
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check FSTYPE=bdb
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check-swig-pl
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${REGRESS_FLAGS} check FSTYPE=bdb
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${REGRESS_FLAGS} check-swig-pl
 .endif
 
 post-install:
 .if !${FLAVOR:L:Mno_bindings}
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-py
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-pl
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${FAKE_FLAGS} install-swig-py
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${FAKE_FLAGS} install-swig-pl
 .endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/backup
diff --git a/devel/subversion/pkg/PFRAG.shared b/devel/subversion/pkg/PFRAG.shared
index 6f9c8ae4cc1..a8a8e58075b 100644
--- a/devel/subversion/pkg/PFRAG.shared
+++ b/devel/subversion/pkg/PFRAG.shared
@@ -1,14 +1,14 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
-@lib lib/libsvn_client-1.so.0.0
-@lib lib/libsvn_delta-1.so.0.0
-@lib lib/libsvn_diff-1.so.0.0
-@lib lib/libsvn_fs-1.so.0.0
-@lib lib/libsvn_fs_base-1.so.0.0
-@lib lib/libsvn_fs_fs-1.so.0.0
-@lib lib/libsvn_ra-1.so.0.0
-@lib lib/libsvn_ra_dav-1.so.0.0
-@lib lib/libsvn_ra_local-1.so.0.0
-@lib lib/libsvn_ra_svn-1.so.0.0
-@lib lib/libsvn_repos-1.so.0.0
-@lib lib/libsvn_subr-1.so.0.0
-@lib lib/libsvn_wc-1.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2006/01/07 01:10:11 steven Exp $
+@lib lib/libsvn_client-1.so.${LIBsvn_client-1_VERSION}
+@lib lib/libsvn_delta-1.so.${LIBsvn_delta-1_VERSION}
+@lib lib/libsvn_diff-1.so.${LIBsvn_diff-1_VERSION}
+@lib lib/libsvn_fs-1.so.${LIBsvn_fs-1_VERSION}
+@lib lib/libsvn_fs_base-1.so.${LIBsvn_fs_base-1_VERSION}
+@lib lib/libsvn_fs_fs-1.so.${LIBsvn_fs_fs-1_VERSION}
+@lib lib/libsvn_ra-1.so.${LIBsvn_ra-1_VERSION}
+@lib lib/libsvn_ra_dav-1.so.${LIBsvn_ra_dav-1_VERSION}
+@lib lib/libsvn_ra_local-1.so.${LIBsvn_ra_local-1_VERSION}
+@lib lib/libsvn_ra_svn-1.so.${LIBsvn_ra_svn-1_VERSION}
+@lib lib/libsvn_repos-1.so.${LIBsvn_repos-1_VERSION}
+@lib lib/libsvn_subr-1.so.${LIBsvn_subr-1_VERSION}
+@lib lib/libsvn_wc-1.so.${LIBsvn_wc-1_VERSION}
diff --git a/devel/subversion/pkg/PFRAG.shared-perl b/devel/subversion/pkg/PFRAG.shared-perl
index 769d11166b9..705f67d2d31 100644
--- a/devel/subversion/pkg/PFRAG.shared-perl
+++ b/devel/subversion/pkg/PFRAG.shared-perl
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared-perl,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
-@lib lib/libsvn_swig_perl-1.so.0.0
+@comment $OpenBSD: PFRAG.shared-perl,v 1.2 2006/01/07 01:10:11 steven Exp $
+@lib lib/libsvn_swig_perl-1.so.${LIBsvn_swig_perl-1_VERSION}
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.so
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/_Core.so
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/_Delta.so
diff --git a/devel/subversion/pkg/PFRAG.shared-python b/devel/subversion/pkg/PFRAG.shared-python
index 4b1bd1d536d..1e94a76d15d 100644
--- a/devel/subversion/pkg/PFRAG.shared-python
+++ b/devel/subversion/pkg/PFRAG.shared-python
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared-python,v 1.1.1.1 2004/12/01 16:47:54 alek Exp $
-@lib lib/libsvn_swig_py-1.so.0.0
+@comment $OpenBSD: PFRAG.shared-python,v 1.2 2006/01/07 01:10:11 steven Exp $
+@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
 lib/python${PYTHON_VER}/site-packages/libsvn/_client.so
 lib/python${PYTHON_VER}/site-packages/libsvn/_core.so
 lib/python${PYTHON_VER}/site-packages/libsvn/_delta.so