Author: gjb (doc,ports committer)
Date: Thu Jan 24 01:41:11 2013
New Revision: 245864
URL: http://svnweb.freebsd.org/changeset/base/245864
Log:
MFC r223148, r240252, r241541, r241543, r245756:
r223148: (ru)
- Document all trees that support CVS_UPDATE.
- Document all trees that support SUP_UPDATE.
- Document SVN_UPDATE.
- Document NO_WWWUPDATE.
- make.conf(5) mistakenly said that *SUPFILE* had defaults.
- Add an example entry for WWWSUPFILE.
r240252: (eadler)
- Remove documentation and www cvsup files as they are no longer
useful with the switch to subversion.
r241541: (joel)
- Minor mdoc improvements. Also remove unnecessary csup reference.
r241543: (eadler)
- Bump .Dd
r245756:
- Mark SUP_UPDATE as deprecated in make.conf(5), providing
instructions to use SVN_UPDATE or freebsd-update(8).
- While here, remove bogus NO_WWWUPDATE.
Modified:
stable/8/share/man/man5/make.conf.5
stable/8/share/man/man5/portindex.5
Directory Properties:
stable/8/share/man/man5/ (props changed)
Modified: stable/8/share/man/man5/make.conf.5
==============================================================================
--- stable/8/share/man/man5/make.conf.5 Thu Jan 24 01:40:47 2013 (r245863)
+++ stable/8/share/man/man5/make.conf.5 Thu Jan 24 01:41:11 2013 (r245864)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 15, 2009
+.Dd January 21, 2013
.Dt MAKE.CONF 5
.Os
.Sh NAME
@@ -182,7 +182,11 @@ options.
.Pq Vt bool
Set this to use
.Xr cvs 1
-to update your ports with
+to update your
+.Pa src , ports
+and
+.Pa doc
+trees with
.Dq Li "make update" .
.It Va CXXFLAGS
.Pq Vt str
@@ -197,14 +201,6 @@ value, use
.Dq Li +=
instead of
.Dq Li = .
-.It Va DOCSUPFILE
-.Pq Vt str
-The documentation
-.Ar supfile
-to use when doing a
-.Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/doc\-supfile .
.It Va INSTALL
.Pq Vt str
the default install command.
@@ -266,8 +262,8 @@ The ports
.Ar supfile
to use when doing a
.Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/ports\-supfile .
+For example,
+.Pa /usr/share/examples/cvsup/ports-supfile .
.It Va SUP
.Pq Vt str
The location of the
@@ -282,24 +278,20 @@ The first
.Ar supfile
to use when doing a
.Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/standard\-supfile .
+For example,
+.Pa /usr/share/examples/cvsup/standard-supfile .
.It Va SUPFILE1
.Pq Vt str
The second
.Ar supfile
to use when doing a
.Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/secure\-supfile .
.It Va SUPFILE2
.Pq Vt str
The third
.Ar supfile
to use when doing a
.Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/secure\-supfile .
.It Va SUPFLAGS
.Pq Vt str
The flag for the
@@ -316,16 +308,25 @@ The hostname of the sup server to use wh
.Pq Vt bool
Set this to use
.Xr cvsup 1
-to update your ports with
+to update your
+.Pa src ,
+and
+.Pa ports
+trees with
+.Dq Li "make update" .
+This option is deprecated.
+Please use
+.Va SVN_UPDATE
+or
+.Xr freebsd-update 8 .
+.It Va SVN_UPDATE
+.Pq Vt bool
+Set this to use
+.Xr svn 1
+to update your
+.Pa src
+tree with
.Dq Li "make update" .
-.It Va WWWSUPFILE
-.Pq Vt str
-The www
-.Ar supfile
-to use when doing a
-.Dq Li "make update"
-This defaults to
-.Pa /usr/share/examples/cvsup/www\-supfile .
.El
.Ss "BUILDING THE KERNEL"
The following list provides a name and short description for variables
@@ -731,6 +732,7 @@ filter, or both.
.Bl -tag -width ".Pa /usr/share/examples/etc/make.conf" -compact
.It Pa /etc/make.conf
.It Pa /usr/doc/Makefile
+.It Pa /usr/ports/Makefile
.It Pa /usr/share/examples/etc/make.conf
.It Pa /usr/share/mk/sys.mk
.It Pa /usr/src/Makefile
Modified: stable/8/share/man/man5/portindex.5
==============================================================================
--- stable/8/share/man/man5/portindex.5 Thu Jan 24 01:40:47 2013 (r245863)
+++ stable/8/share/man/man5/portindex.5 Thu Jan 24 01:41:11 2013 (r245864)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 8, 2012
+.Dd October 14, 2012
.Dt PORTINDEX 5
.Os
.Sh NAME
@@ -48,7 +48,7 @@ branch, i.e.:
.Pa INDEX-7 ,
or
.Pa INDEX-8 .
-.Bl -tag -compact -width indent
+.Bl -tag -width XXXXXXXXXX
.It Cm \&name
The name of the package.
.It Cm \&path
@@ -77,7 +77,7 @@ Ports that may be required to patch this
Ports that may be required to fetch this port.
.El
.Sh FILES
-.Bl -tag -width /usr/ports/INDEX-8
+.Bl -tag -width /usr/ports/INDEX-8XX
.It Pa /usr/ports/INDEX- Ns Ar N
where
.Ar N
@@ -91,7 +91,6 @@ vim-6.3.15|/usr/ports/editors/vim|/usr/l
.Ed
.Sh SEE ALSO
.Xr build 7 ,
-.Xr csup 1 ,
.Xr ports 7
.Sh AUTHORS
.An -nosplit