diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 9ca1d5083e3..8e7573fdef8 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.10 2005/09/16 09:51:27 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2005/10/02 09:02:05 alek Exp $
 
 COMMENT=	"subversion revision control system"
 COMMENT-perl=	"perl interface to subversion"
 COMMENT-python=	"python interface to subversion"
 
-VERSION=	1.2.1
+VERSION=	1.2.3
 DISTNAME=	subversion-${VERSION}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}
 PKGNAME-perl=	p5-SVN-${VERSION}
 PKGNAME-python=	py-subversion-${VERSION}
 CATEGORIES=	devel
@@ -59,7 +59,7 @@ BUILD_DEPENDS=	::lang/python/${PYTHON_VER} \
 .  endif
 .endif
 
-.if defined(PACKAGING) && empty(SUBPACKAGE)
+.if defined(PACKAGING) && (!defined(SUBPACKAGE) || empty(SUBPACKAGE))
 WANTLIB+=	crypto m ssl xml2 c
 .endif
 
@@ -95,13 +95,40 @@ post-build:
 	@cd ${WRKBUILD} && ${MAKE_PROGRAM} swig-py
 	@cd ${WRKBUILD} && ${MAKE_PROGRAM} swig-pl
 
-post-install:
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-py
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-pl
-
 post-regress:
 	@cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check FSTYPE=bdb
 	@cd ${WRKBUILD} && ${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
+.endif
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/backup
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts/mailer
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
+	${INSTALL_DATA} ${WRKBUILD}/tools/backup/hot-backup.py \
+			${PREFIX}/share/examples/subversion/backup
+	${INSTALL_DATA} ${WRKBUILD}/tools/hook-scripts/* \
+			${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/README \
+			${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-access-control.cfg.example \
+			${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.rb \
+			${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.conf.example \
+			${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.py \
+			${PREFIX}/share/examples/subversion/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example \
+			${PREFIX}/share/examples/subversion/hook-scripts/mailer
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
+			${PREFIX}/share/examples/subversion/hook-scripts/mailer
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/* \
+			${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
+
 .include <bsd.port.mk>
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index de02e7757ef..b33432e6c57 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,4 +1,4 @@
-MD5 (subversion-1.2.1.tar.gz) = 01c3742745d50d4395684a4fb2908c5f
-RMD160 (subversion-1.2.1.tar.gz) = 7768a29ad96746285cb4ed9b32fc54c07f97f4f4
-SHA1 (subversion-1.2.1.tar.gz) = 88d3dd6e8c191933c8966faa5c69dc4ee84411cf
-SIZE (subversion-1.2.1.tar.gz) = 8847778
+MD5 (subversion-1.2.3.tar.gz) = 95f9b43801b4d9bc071564bca2116763
+RMD160 (subversion-1.2.3.tar.gz) = 4a39e2b9f4dcd39023e785ce0a31b3bd493d6a85
+SHA1 (subversion-1.2.3.tar.gz) = 790cfc94db98799a48a157fef22a13c878e74345
+SIZE (subversion-1.2.3.tar.gz) = 8868156
diff --git a/devel/subversion/pkg/DESCR b/devel/subversion/pkg/DESCR
index f3184a04054..dc4639ef134 100644
--- a/devel/subversion/pkg/DESCR
+++ b/devel/subversion/pkg/DESCR
@@ -13,5 +13,5 @@ is only used as a client, however.
 
 Note that you need to install the following subpackages to gain
 the appropriate functionality:
-        -perl   Python bindings to Subversion
-        -python Perl bindings to Subversion
+        -perl   Perl bindings to Subversion
+        -python Python bindings to Subversion
diff --git a/devel/subversion/pkg/PLIST b/devel/subversion/pkg/PLIST
index 361e5398974..cf28419ada5 100644
--- a/devel/subversion/pkg/PLIST
+++ b/devel/subversion/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/09/16 09:51:27 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2005/10/02 09:02:05 alek Exp $
 @pkgpath devel/subversion,no_bindings
 %%SHARED%%
 bin/svn
@@ -76,40 +76,35 @@ lib/libsvn_wc-1.la
 @man man/man1/svnversion.1
 @man man/man5/svnserve.conf.5
 @man man/man8/svnserve.8
-share/locale/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
+share/examples/subversion/
+share/examples/subversion/backup/
+share/examples/subversion/backup/hot-backup.py
+share/examples/subversion/hook-scripts/
+share/examples/subversion/hook-scripts/README
+share/examples/subversion/hook-scripts/commit-access-control.cfg.example
+share/examples/subversion/hook-scripts/commit-access-control.pl
+share/examples/subversion/hook-scripts/commit-email.pl
+share/examples/subversion/hook-scripts/commit-email.rb
+share/examples/subversion/hook-scripts/mailer/
+share/examples/subversion/hook-scripts/mailer/mailer.conf.example
+share/examples/subversion/hook-scripts/mailer/mailer.py
+share/examples/subversion/hook-scripts/mailer/tests/
+share/examples/subversion/hook-scripts/mailer/tests/mailer-init.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.output
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-tweak.py
+share/examples/subversion/hook-scripts/propchange-email.pl
+share/examples/subversion/hook-scripts/svnperms.conf.example
+share/examples/subversion/hook-scripts/svnperms.py
 share/locale/de/LC_MESSAGES/subversion.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/subversion.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/subversion.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/subversion.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/subversion.mo
-share/locale/ko/
-share/locale/ko/LC_MESSAGES/
 share/locale/ko/LC_MESSAGES/subversion.mo
-share/locale/nb/
-share/locale/nb/LC_MESSAGES/
 share/locale/nb/LC_MESSAGES/subversion.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/subversion.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
 share/locale/pt_BR/LC_MESSAGES/subversion.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/subversion.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
 share/locale/zh_CN/LC_MESSAGES/subversion.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
 share/locale/zh_TW/LC_MESSAGES/subversion.mo