Bug 163162

On Sat, 10 Dec 2011, Oliver Hartmann wrote:

>> Description:
> make.conf(5) describes SVN_UPDATE variable to be set for usage subversion for updating and maintainig /usr/src via "make update". But as with the recent settings and even with SVN_UPDATE set to YES in make.conf a simply "make update" typed in /usr/src will fail with a "svn not found" error, since the path to svn hasn't been properly set.
> The file /usr/src/Makefile.inc1 reveals that there are to flags that could be set to target mainance via svn: SVN itself targetting the path to the svn binary and SVNFLAGS setting for the repository to be targeted. None of them are mentioned in make.conf(5) and I'd like to see some notes in make.conf(5) on that.

The patch I sent to the thread on -current is attached.

-Ben Kaduk

Comment 2 Glen Barber 2011-12-11 03:46:22 UTC

Responsible Changed
From-To: freebsd-doc->gjb

Make this mine.

Comment 3 dfilter service 2011-12-11 19:53:26 UTC

Author: gjb (doc committer)
Date: Sun Dec 11 19:53:11 2011
New Revision: 228418
URL: http://svn.freebsd.org/changeset/base/228418

Log:
  Document the SVN variable needs to be set in make.conf(5) when SVN_UPDATE
  is set.
  
  PR:		163162
  Submitted by:	Oliver Hartmann <ohartman!zedat.fu-berlin.de>
  Patch by:	Benjamin Kaduk <kaduk!mit.edu> (original)
  MFC after:	1 week

Modified:
  head/share/man/man5/make.conf.5

Modified: head/share/man/man5/make.conf.5
==============================================================================
--- head/share/man/man5/make.conf.5	Sun Dec 11 19:28:04 2011	(r228417)
+++ head/share/man/man5/make.conf.5	Sun Dec 11 19:53:11 2011	(r228418)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 16, 2011
+.Dd December 11, 2011
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -333,6 +333,12 @@ to update your
 .Pa src
 tree with
 .Dq Li "make update" .
+Note that since a subversion client is not included in the base system,
+you will need to set
+.Va SVN
+to the full path of a
+.Xr svn 1
+binary.
 .It Va WWWSUPFILE
 .Pq Vt str
 The www
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 4 Glen Barber 2011-12-11 19:53:28 UTC

State Changed
From-To: open->patched

Patched in head (r228418) pending MFC.

Comment 5 dfilter service 2012-01-02 22:11:28 UTC

Author: gjb (doc committer)
Date: Mon Jan  2 22:11:08 2012
New Revision: 229320
URL: http://svn.freebsd.org/changeset/base/229320

Log:
  MFC r228418, 228419:
  
  r228418:
   - Document the SVN variable needs to be set in make.conf(5) when
     SVN_UPDATE is set [1]
  
  r228419:
   - Minor whitespace cleanup to make.conf(5)
  
  PR:		163162 [1]

Modified:
  stable/9/share/man/man5/make.conf.5
Directory Properties:
  stable/9/share/man/man5/   (props changed)

Modified: stable/9/share/man/man5/make.conf.5
==============================================================================
--- stable/9/share/man/man5/make.conf.5	Mon Jan  2 21:57:58 2012	(r229319)
+++ stable/9/share/man/man5/make.conf.5	Mon Jan  2 22:11:08 2012	(r229320)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 16, 2011
+.Dd December 11, 2011
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -333,6 +333,12 @@ to update your
 .Pa src
 tree with
 .Dq Li "make update" .
+Note that since a subversion client is not included in the base system,
+you will need to set
+.Va SVN
+to the full path of a
+.Xr svn 1
+binary.
 .It Va WWWSUPFILE
 .Pq Vt str
 The www
@@ -494,7 +500,7 @@ rather than load the server's kernel.
 .Pq Vt bool
 Defining this and recompiling
 .Pa /usr/src/sys/boot/i386
-will add 
+will add
 .Xr dcons 4
 console driver to
 .Xr loader 8
@@ -634,7 +640,7 @@ The default value is 0640.
 .Pq Vt str
 Additional maps to rebuild when using
 .Pa /etc/mail/Makefile .
-The 
+The
 .Pa access ,
 .Pa bitdomain ,
 .Pa domaintable ,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 6 Glen Barber 2012-01-02 22:27:12 UTC

State Changed
From-To: patched->closed

MFC'd to stable/9.  Thanks!