Explain the scheme to update build-outputs.mk when the svn version changes.

2 files changed, 23 insertions, 8 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index ee0f25ef7a8..3a3f0c88503 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/05/30 00:16:47 gdt Exp $
+# $NetBSD: Makefile,v 1.64 2009/06/01 18:56:08 gdt Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -64,10 +64,23 @@ post-install:
 		${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
 
 .PHONY: svn-build-outputs-hack
-# Use this target to update the build-outputs.mk hack for sub-packages.
+# Subversion's build system is set up to build everything from source
+# at once.  In pkgsrc, we install the base part of subversion, and
+# then build other pieces against installed libraries.  Here, we run
+# svn's equivalent of automake to say that the libraries installed as
+# part of subversion-base are installed, and save that generated file.
+# Other packages then copy this file into place when building to avoid
+# having to build these libraries again.
+#
+# The normal update procedure is
+#   test build and package subversion-base
+#   run make svn-build-outputs-hack
+#   test build and package other subversion packages
+#   commit the update to ../subversion/files/build-outputs.mk along with the version change
+#
 svn-build-outputs-hack:
 	cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
-	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
+	${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index a97cb6ee46a..12141afee63 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.version,v 1.49 2009/05/30 00:16:47 gdt Exp $
+# $NetBSD: Makefile.version,v 1.50 2009/06/01 18:56:08 gdt Exp $
+
+# When updating subversion, all packages are updated at the same time
+# to have a consistent set of packages.  A particularly tricky aspect
+# is our interaction with the svn build system.  See the make target
+# "svn-build-outputs-hack" in devel/subversion-base/Makefile when
+# changing the version.
 
 .if !defined(SVNVER)
-# As of 2009-03-22 gdt@NetBSD.org knows 1.6.0 is out, but is
-# intentionally waiting until post-2009Q1 and until there is enough
-# experience with 1.6.0 before subjecting pkgsrc users to it.  Update
-# will probably come mid to late April; comments welcome.
 SVNVER=		1.6.2
 .endif