diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2011-06-16 12:28:37 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2011-06-16 12:28:37 +0000 |
commit | 69c488cdc6ed5346e27ba559d54e9b2879de04d8 (patch) | |
tree | 2e699b6bf3e5c7313843274c0a75352fd79b050a /share | |
parent | db9ff08bb8c52b40a1e649f20649d6ffc1e6719e (diff) | |
download | src-69c488cdc6ed5346e27ba559d54e9b2879de04d8.tar.gz src-69c488cdc6ed5346e27ba559d54e9b2879de04d8.zip |
It's a bit odd, but "make update" in src/ can also update the ports/,
doc/, and now www/ trees, but only using the "cvsup" transport.
When "make update" is run using a tree's makefile, it can also use
"cvs" (except for www/) and "svn" (only src/).
Clean up documentation and code regarding "make update":
- Increase oddness by adding support for WWWSUPFILE and NO_WWWUPDATE to
Makefile.inc1 (analogous to PORTSSUPFILE/NO_PORTSUPDATE and
DOCSUPFILE/NO_DOCUPDATE; WWWSUPFILE already supported by www/Makefile).
- 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.
Notes
Notes:
svn path=/head/; revision=223148
Diffstat (limited to 'share')
-rw-r--r-- | share/examples/etc/make.conf | 1 | ||||
-rw-r--r-- | share/man/man5/make.conf.5 | 49 | ||||
-rw-r--r-- | share/man/man7/build.7 | 6 |
3 files changed, 39 insertions, 17 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 516a0e20edf3..d3cdf3e7d279 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -188,6 +188,7 @@ #SUPFILE= /usr/share/examples/cvsup/standard-supfile #PORTSSUPFILE= /usr/share/examples/cvsup/ports-supfile #DOCSUPFILE= /usr/share/examples/cvsup/doc-supfile +#WWWSUPFILE= /usr/share/examples/cvsup/www-supfile # # top(1) uses a hash table for the user names. The size of this hash # can be tuned to match the number of local users. The table size should diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 0f9e70d3b848..c424a1ea1ad3 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 15, 2009 +.Dd June 16, 2011 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -181,7 +181,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 @@ -202,8 +206,8 @@ The documentation .Ar supfile to use when doing a .Dq Li "make update" . -This defaults to -.Pa /usr/share/examples/cvsup/doc\-supfile . +For example, +.Pa /usr/share/examples/cvsup/doc-supfile . .It Va INSTALL .Pq Vt str the default install command. @@ -259,14 +263,18 @@ Set this to not update the doc tree during .Pq Vt bool Set this to not update the ports tree during .Dq Li "make update" . +.It Va NO_WWWUPDATE +.Pq Vt bool +Set this to not update the www tree during +.Dq Li "make update" . .It Va PORTSSUPFILE .Pq Vt str 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 @@ -281,24 +289,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 @@ -315,16 +319,28 @@ The hostname of the sup server to use when doing .Pq Vt bool Set this to use .Xr cvsup 1 -to update your ports with +to update your +.Pa src , ports , doc +and +.Pa www +trees with +.Dq Li "make update" . +.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 . +.Dq Li "make update" . +For example, +.Pa /usr/share/examples/cvsup/www-supfile . .El .Ss "BUILDING THE KERNEL" The following list provides a name and short description for variables @@ -730,6 +746,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 diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 22305b7c0e77..b43a961d6777 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 18, 2011 +.Dd June 16, 2011 .Dt BUILD 7 .Os .Sh NAME @@ -517,6 +517,10 @@ target. If set, the update process does not update the Ports tree as part of the .Dq make update target. +.It Va NO_WWWUPDATE +If set, the update process does not update the www tree as part of the +.Dq make update +target. .El .Pp Builds under directory |