From e08a8123c530058ee03383a4030f105c17324962 Mon Sep 17 00:00:00 2001 From: eadler Date: Fri, 14 Sep 2012 17:50:42 +0000 Subject: Bump date missed in r202756 PR: docs/171624 Submitted by: bdrewery Approved by: gabor MFC after: 3 days --- share/man/man7/hier.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/man/man7') diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index df76f46..2989eb4e 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -32,7 +32,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd May 25, 2008 +.Dd January 21, 2010 .Dt HIER 7 .Os .Sh NAME -- cgit v1.1 From 8a299c10115a30f0996fed7dcf938e37f2c6b794 Mon Sep 17 00:00:00 2001 From: gjb Date: Mon, 17 Sep 2012 02:45:52 +0000 Subject: Update release(7) to reflect changes from r240586 and r240587: - Remove cvs(1) references. - Remove CVS* environment references. - Add default entries for the default SVNROOT for the Ports Collection, and Documentation Project. - While here, update 'SGML-based documentation' to 'XML-based', since the recent SGML->XML conversion. - Update an example providing SVNROOT environment usage. Reminded by: nwhitehorn MFC After: 1 week X-MFC-With: r240586, r240587 --- share/man/man7/release.7 | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 2a794c8..ff6fec4 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 14, 2012 +.Dd September 16, 2012 .Dt RELEASE 7 .Os .Sh NAME @@ -105,11 +105,7 @@ environment in It then checks out the src tree specified by .Ar svn-branch using -.Xr svn 1 -and (optionally) the ports and documentation trees using -.Xr csup 1 -or -.Xr cvs 1 . +.Xr svn 1 . Once the various source trees have been obtained, it executes .Dq Li "make release" within the @@ -122,33 +118,19 @@ release media. .Pp Environment variables: .Bl -tag -width ".Cm MAKE_FLAGS" -.It Ev CVSUP_HOST -The CVSUP server to use for the doc and ports trees. One of -.Ev CVSUP_HOST -or -.Ev CVSROOT -must be specified for ports and documentation to be included in the release. -.It Ev CVSROOT -The location of the -.Fx -CVS repository to use for the doc and ports trees. One of -.Ev CVSUP_HOST -or -.Ev CVSROOT -must be specified for ports and documentation to be included in the release. -.It Ev CVS_TAG -If the variable -.Ev CVS_TAG -is set, that tag will be used for CVS checkouts (doc and ports), otherwise -.Ic generate-release.sh -will use HEAD. .It Ev MAKE_FLAGS This environment variable can be set to pass flags (e.g. -j) to .Xr make 1 when invoked by the script. .It Ev SVNROOT -The location of the FreeBSD SVN source repository. Defaults to -.Pa svn://svn.freebsd.org/base . +The location of the FreeBSD SVN source, doc, and ports repositories. +Defaults to +.Pa svn://svn.freebsd.org/base +for the source tree, +.Pa svn://svn.freebsd.org/ports/head +for the Ports Collection, and +.Pa svn://svn.freebsd.org/doc/head +for the Documentation Project source. .It Ev RELSTRING Optional base name for generated media images (e.g. FreeBSD-9.0-RC2-amd64). Defaults to the output of @@ -246,7 +228,7 @@ If defined, the Ports Collection will be omitted from the release. .It Va NOSRC If set, do not include system source code in the release. .It Va NODOC -If defined, the SGML-based documentation from the +If defined, the XML-based documentation from the .Fx Documentation Project will not be built. However, the @@ -317,7 +299,7 @@ The following sequence of commands can be used to build a in a clean environment, including ports and documentation: .Bd -literal -offset indent cd /usr/src/release -export CVSUP_HOST=cvsupN.freebsd.org +export SVNROOT=svn://svn.freebsd.org/base sh generate-release.sh head /local3/release .Ed .Pp @@ -326,7 +308,6 @@ After running these commands, all prepared release files are available in the directory. .Sh SEE ALSO .Xr cc 1 , -.Xr cvs 1 , .Xr install 1 , .Xr make 1 , .Xr svn 1 Pq Pa ports/devel/subversion-freebsd , @@ -376,7 +357,7 @@ was overhauled and the wrapper script introduced to support the introduction of a new installer. .Pp At near 1000 revisions spread over multiple branches, the -.Xr cvs 1 +.Xr svn 1 log of .Pa src/release/Makefile contains a vivid historical record of some -- cgit v1.1 From 033aa5b964a695e42b37010319e22eeaf6be8523 Mon Sep 17 00:00:00 2001 From: eadler Date: Thu, 20 Sep 2012 03:48:36 +0000 Subject: Rewrite portions of development.7 to make sense in the world of subversion. Approved by: gjb MFC after: 2 weeks --- share/man/man7/development.7 | 291 ++++++------------------------------------- 1 file changed, 41 insertions(+), 250 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index ea7df38..1f25871 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 2, 2012 +.Dd September 19, 2012 .Dt DEVELOPMENT 7 .Os .Sh NAME @@ -48,7 +48,7 @@ kernel. The methods described here are as applicable to production installations as it is to development environments. -You need a good 12-17GB of disk space on one machine to make this work +You need approximately 10GB of disk space on one machine to make this work conveniently. .Sh SETTING UP THE ENVIRONMENT ON THE MASTER SERVER Your master server should always run a stable, production version of the @@ -62,9 +62,9 @@ where you lose the environment and/or cannot recover from a mistake. .Pp Create a huge partition called .Pa /FreeBSD . -8-12GB is recommended. +Approximately 7GB is recommended. This partition will contain nearly all the development environment, -including the CVS tree, broken-out source, and possibly even object files. +including the subversion tree, broken-out source, and possibly even object files. You are going to export this partition to your other machines via a READ-ONLY NFS export so do not mix it with other more security-sensitive partitions. @@ -89,70 +89,19 @@ I recommend a partition of at least 5GB. .Pp On the master server, use -.Xr csup 1 -to automatically pull down and maintain +.Xr svn 1 +to pull down and maintain the .Fx -CVS archive once a day. +source. The first pull will take a long time, it is several gigabytes, but once you have it, -the daily synchronizations will be quite small. -.Bd -literal -offset 4n -mkdir /FreeBSD/FreeBSD-CVS -rm -rf /home/ncvs -ln -s /FreeBSD/FreeBSD-CVS /home/ncvs -.Ed -.Pp -The -.Xr cron 8 -job should look something like this (please randomize the time of -day!). -Note that you can use the -.Xr csup 1 -configuration file example directly from -.Pa /usr/share/examples -without modification by supplying appropriate arguments -to -.Xr csup 1 . -.Bd -literal -offset 4n -33 6 * * * /usr/bin/csup -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile -.Ed -.Pp -Run the -.Xr csup 1 -manually the first time to pull down the archive. -It could take -all day depending on how fast your connection is! -You will run all -.Xr csup 1 -and -.Xr cvs 1 +the updates will be quite small. +Run all +.Xr svn 1 operations as .Dq Li root -and you need to set up a -.Pa ~/.cvsrc -.Pq Pa /root/.cvsrc -file, as shown below, for proper -.Xr cvs 1 -operation. -Using -.Pa ~/.cvsrc -to specify -.Xr cvs 1 -defaults is an excellent way to -.Dq "file and forget" , -but you should never forget that you put them in there. -.Bd -literal -offset 4n -# cvs -q -diff -u -update -Pd -checkout -P -.Ed .Pp -Now use -.Xr cvs 1 -to check out a -STABLE source tree and a -CURRENT source tree, -as well as ports and docs, to create your initial source environment. Keeping the broken-out source and ports in .Pa /FreeBSD allows you to export @@ -160,71 +109,16 @@ it to other machines via read-only NFS. This also means you only need to edit/maintain files in one place and all your clients automatically pick up the changes. .Bd -literal -offset 4n -mkdir /FreeBSD/FreeBSD-4.x -mkdir /FreeBSD/FreeBSD-current - -cd /FreeBSD/FreeBSD-4.x -cvs -d /home/ncvs checkout -rRELENG_4 src - -cd /FreeBSD/FreeBSD-current -cvs -d /home/ncvs checkout src -cvs -d /home/ncvs checkout ports -cvs -d /home/ncvs checkout doc -.Ed -.Pp -Now create a softlink for -.Pa /usr/src -and -.Pa /usr/src2 . -On the main server I always point -.Pa /usr/src -at -STABLE and -.Pa /usr/src2 -at -CURRENT. -On client machines I usually do not have a -.Pa /usr/src2 -and I make -.Pa /usr/src -point at whatever version of -.Fx -the client box is intended to -run. -.Bd -literal -offset 4n -cd /usr -rm -rf src src2 -ln -s /FreeBSD/FreeBSD-4.x/src src (could be -CURRENT on a client) -ln -s /FreeBSD/FreeBSD-current/src src2 (MASTER SERVER ONLY) -.Ed -.Pp -Now you have to make a choice for -.Pa /usr/obj . -Well, hopefully you made it already and chose the partition method. -If you -chose poorly you probably intend to put it in -.Pa /FreeBSD -and, if so, this is -what you want to do: -.Bd -literal -offset 4n -(ONLY IF YOU MADE A POOR CHOICE AND PUT /usr/obj in /FreeBSD!) -mkdir /FreeBSD/obj +mkdir /FreeBSD +cd /FreeBSD +svn co svn://svn.freebsd.org/ports/head ports +svn co svn://svn.freebsd.org/doc/head doc +svn co svn://svn.freebsd.org/base/head src cd /usr -rm -rf obj -ln -s /FreeBSD/obj obj +rm -rf src +ln -s /FreeBSD/src src .Ed .Pp -Alternatively you may chose simply to leave -.Pa /usr/obj -in -.Pa /usr . -If your -.Pa /usr -is large enough this will work, but I do not recommend it for -safety reasons -.Pa ( /usr/obj -is constantly being modified, -.Pa /usr -is not). -.Pp Note that exporting .Pa /usr/obj via read-only NFS to your other boxes will @@ -240,19 +134,17 @@ problems and issues down the line and presents a security problem as well. It is far easier to do builds on the master server and then only do installs on the clients. .Pp -I usually maintain my ports tree via CVS. -It is sitting right there in the master CVS archive and I have even told you -to check it out (see above). +I usually maintain my ports tree via svn or portsnap. With some fancy softlinks you can make the ports tree available both on your master server and on all of your other machines. -Note that the ports tree exists only on the HEAD CVS branch, so its always --CURRENT even on a -STABLE box. +Note that the ports tree exists only on the HEAD ports branch, so its always +usable even on a -STABLE box. This is what you do: .Bd -literal -offset 4n (THESE COMMANDS ON THE MASTER SERVER AND ON ALL CLIENTS) cd /usr rm -rf ports -ln -s /FreeBSD/FreeBSD-current/ports ports +ln -s /FreeBSD/ports ports cd /usr/ports (this pushes into the softlink) rm -rf distfiles (ON MASTER SERVER ONLY) @@ -344,7 +236,7 @@ into the NFS-mounted environment. If a particular client is running -CURRENT, .Pa /usr/src should be a softlink to -.Pa /FreeBSD/FreeBSD-current/src . +.Pa /FreeBSD/src . If it is running -STABLE, .Pa /usr/src should be a softlink to @@ -359,8 +251,8 @@ human variety) on a client. (ON EACH CLIENT) cd /usr rm -rf ports src -ln -s /FreeBSD/FreeBSD-current/ports ports -ln -s /FreeBSD/FreeBSD-XXX/src src +ln -s /FreeBSD/ports ports +ln -s /FreeBSD/src src .Ed .Pp Do not forget to create the working directories so you can build ports, as @@ -521,11 +413,6 @@ subdirectory in which is typically local to the client. You can then do builds to your heart's content! .Sh MAINTAINING A LOCAL BRANCH -I have described how to maintain two versions of the source tree, a stable -version in -.Pa /FreeBSD/FreeBSD-4.x -and a current version in -.Pa /FreeBSD/FreeBSD-current . There is absolutely nothing preventing you from breaking out other versions of the source tree into @@ -548,135 +435,33 @@ which can build those other operating systems. Many developers choose to maintain a local branch of .Fx to test patches or build a custom distribution. -This can be done with CVS or another source code management system -(SubVersion, Perforce, BitKeeper) with its own repository. -Since the main -.Fx -tree is based on CVS, the former is convenient. -.Pp -First, you need to modify your -.Xr csup 1 -environment to avoid it modifying -the local changes you have committed to the repository. -It is important to remove the -.Ic delete -keyword from your -.Pa supfile -and to add the -.Pa CVSROOT -subdirectory to your -.Pa refuse -file. -For more information, see -.Xr csup 1 . -.Pp -The -.Fx -version of -.Xr cvs 1 -examines a custom environmental variable, -.Ev CVS_LOCAL_BRANCH_NUM , -which specifies an integer to use when doing a -.Xr cvs 1 -.Cm tag Ns / Ns Cm rtag . -Set this number to something high (say 1000) to avoid colliding -with potential future branches of the main repository. -For example, -branching a file with version 1.4 produces 1.4.1000. -Future commits to this branch will produce revisions 1.4.1000.1, -1.4.1000.2, etc. +This can be done with svn or another source code management system +(git, mercurial, Perforce, BitKeeper) with its own repository. .Pp -To fork your local branch, do: -.Bd -literal -offset 4n -cvs rtag -r RELENG_4 -b LOCAL_RELENG_4 src -.Ed -.Pp -After this, you can check out a copy from your local repository using the -new tag and begin making changes and committing them. -For more information on using CVS, see -.Xr cvs 1 . -.Pp -.Sy WARNING! -The -.Xr csup 1 -utility may blow away changes made on a local branch in -some situations. -This has been reported to occur when the master CVS repository is -directly manipulated or an RCS file is changed. -At this point, -.Xr csup 1 -notices that the client and server have entirely -different RCS files, so it does a full replace instead of trying to -send just deltas. -Ideally this situation should never arise, but in the real world it -happens all the time. -.Pp -While this is the only scenario where the problem should crop up, -there have been some suspicious-sounding reports of -.Ev CVS_LOCAL_BRANCH_NUM -lossage that cannot be explained by this alone. -Bottom line is, if you value your local branch then you -should back it up before every update. -.Sh UPDATING VIA CVS -The advantage of using -.Xr csup 1 -to maintain an updated copy of the CVS -repository instead of using it to maintain source trees directly is that you -can then pick and choose when you bring your source tree (or pieces of your -source tree) up to date. +.Sh "UPDATING VIA SVN" By using a .Xr cron 8 -job to maintain an updated CVS repository, you can update -your source tree at any time without any network cost as follows: +job to maintain an updated svn repository, +the source tree can be +updated at any time as follows: .Bd -literal -offset 4n (on the main development server) -cd /usr/src -cvs -d /home/ncvs update -cd /usr/src2 -cvs -d /home/ncvs update -cd /usr/ports -cvs -d /home/ncvs update +cd /usr +svn update src doc ports .Ed .Pp It is that simple, and since you are exporting the whole lot to your clients, your clients have immediate visibility into the updated source. This is a good time to also remind you that most of the -.Xr cvs 1 +.Xr svn 1 operations you do will be done as -.Dq Li root , -and that certain options are -required for CVS to operate properly on the -.Fx -repository. -For example, -.Fl Pd -is necessary when running -.Nm cvs Cm update . -These options are typically placed in your -.Pa ~/.cvsrc -(as already described) -so you do not have to re-specify them every time you run a -.Xr cvs 1 -command. -Maintaining the CVS repository also gives you far more flexibility -in regards to breaking out multiple versions of the source tree. +.Dq Li root . It is a good idea to give your .Pa /FreeBSD partition a lot of space (I recommend -8-12GB) precisely for that reason. -If you can make it 15GB I would do it. +10-15GB) precisely for that reason. .Pp -I generally do not -.Nm cvs Cm update -via a -.Xr cron 8 -job. -This is because I generally want the source to not change out from under me -when I am developing code. -Instead I manually update the source every so often...\& when I feel it is -a good time. -My recommendation is to only keep the CVS repository synchronized via .Xr cron 8 . .Sh SEE ALSO .Xr crontab 1 , @@ -696,3 +481,9 @@ and first appeared in .Fx 5.0 , December 2002. +It was since extensively modified by +.An Eitan Adler Aq eadler@FreeBSD.org +to reflect the repository conversion from +.Xr cvs +to +.Xr svn . -- cgit v1.1 From 32d0efe39300667d09edc9a16cefedeb9128035d Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 20 Sep 2012 04:53:12 +0000 Subject: mdoc: remove superfluous paragraph macro. --- share/man/man7/development.7 | 1 - 1 file changed, 1 deletion(-) (limited to 'share/man/man7') diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 1f25871..642f482 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -437,7 +437,6 @@ Many developers choose to maintain a local branch of to test patches or build a custom distribution. This can be done with svn or another source code management system (git, mercurial, Perforce, BitKeeper) with its own repository. -.Pp .Sh "UPDATING VIA SVN" By using a .Xr cron 8 -- cgit v1.1 From 9d2d29036982345e1cf61816192bd16627e8a37f Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 22 Sep 2012 21:34:46 +0000 Subject: Remove some duplicated advice. While here increase the suggested sizes for the partition as "make universe" takes a lot more space than mentioned. Reviewed by: gavin Approved by: gjb MFC after: 3 days X-MFC-With: r240728 --- share/man/man7/development.7 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 642f482..3da1858 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -48,8 +48,6 @@ kernel. The methods described here are as applicable to production installations as it is to development environments. -You need approximately 10GB of disk space on one machine to make this work -conveniently. .Sh SETTING UP THE ENVIRONMENT ON THE MASTER SERVER Your master server should always run a stable, production version of the .Fx @@ -60,9 +58,9 @@ The last thing you want to do is to run an unstable environment on your master server which could lead to a situation where you lose the environment and/or cannot recover from a mistake. .Pp -Create a huge partition called +Create a partition called .Pa /FreeBSD . -Approximately 7GB is recommended. +Approximately 20GB is recommended. This partition will contain nearly all the development environment, including the subversion tree, broken-out source, and possibly even object files. You are going to export this partition to your other machines via a @@ -86,7 +84,7 @@ Third, because it makes it far easier to mix and match the development environments which are described later in this document. I recommend a .Pa /usr/obj -partition of at least 5GB. +partition of at least 12GB. .Pp On the master server, use .Xr svn 1 @@ -456,10 +454,6 @@ This is a good time to also remind you that most of the .Xr svn 1 operations you do will be done as .Dq Li root . -It is a good idea to give your -.Pa /FreeBSD -partition a lot of space (I recommend -10-15GB) precisely for that reason. .Pp .Xr cron 8 . .Sh SEE ALSO -- cgit v1.1 From 34debbc87e9c47e2ddd94fe8c497460ba1f49d6f Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 10 Oct 2012 16:07:23 +0000 Subject: WITH_CTF is now a "normal" build option (WITHOUT_CTF is supported and MK_CTF is used internally). Reviewed by: fjoe --- share/man/man7/build.7 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 7cd8d91..931b444 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 2, 2012 +.Dd October 10, 2012 .Dt BUILD 7 .Os .Sh NAME @@ -382,12 +382,6 @@ even if the makefile says otherwise. .It Va WITH_CTF If defined, the build process will run the DTrace CTF conversion tools on built objects. -Please note that this WITH_ option is handled differently than all -other WITH_ options (there is no -.Va WITHOUT_CTF , -or corresponding -.Va MK_CTF -in the build system). .El .Pp Additionally, builds in -- cgit v1.1 From efcca33ac515c354e18135425794400ea32406a8 Mon Sep 17 00:00:00 2001 From: attilio Date: Tue, 16 Oct 2012 09:59:10 +0000 Subject: Disconnect non-MPSAFE PORTALFS from the build in preparation for dropping GIANT from VFS. This is not targeted for MFC. --- share/man/man7/hier.7 | 2 -- 1 file changed, 2 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 2989eb4e..856d946 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -258,8 +258,6 @@ NTFS file system loopback file system .It Pa nwfs/ NetWare file system -.It Pa portalfs/ -portal file system .It Pa procfs/ process file system .It Pa smbfs/ -- cgit v1.1 From 3f4806915ef86ad20f5602a0e46a27fc609e65ba Mon Sep 17 00:00:00 2001 From: attilio Date: Wed, 17 Oct 2012 11:16:17 +0000 Subject: Disconnect non-MPSAFE NWFS from the build in preparation for dropping GIANT from VFS. In addition, disconnect also netncp, which is a base requirement for NWFS. In the possibility of a future maintenance of the code and later readd to the FreeBSD base, maybe we should think about a better location for netncp. I'm not entirely sure the / top location is actually right, however I will let network people to comment on that more specifically. This is not targeted for MFC. --- share/man/man7/hier.7 | 2 -- 1 file changed, 2 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 856d946..e6da882 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -256,8 +256,6 @@ C include files for NFS (Network File System) version 2, 3 and 4 NTFS file system .It Pa nullfs/ loopback file system -.It Pa nwfs/ -NetWare file system .It Pa procfs/ process file system .It Pa smbfs/ -- cgit v1.1 From 85c1a64cecadd26f43985905ac6c8e75e790b490 Mon Sep 17 00:00:00 2001 From: attilio Date: Wed, 17 Oct 2012 11:30:00 +0000 Subject: Disconnect non-MPSAFE NTFS from the build in preparation for dropping GIANT from VFS. This code is particulary broken and fragile and other in-kernel implementations around, found in other operating systems, don't really seem clean and solid enough to be imported at all. If someone wants to reconsider in-kernel NTFS implementation for inclusion again, a fair effort for completely fixing and cleaning it up is expected. In the while NTFS regular users can use FUSE interface and ntfs-3g port to work with their NTFS partitions. This is not targeted for MFC. --- share/man/man7/hier.7 | 2 -- 1 file changed, 2 deletions(-) (limited to 'share/man/man7') diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index e6da882..0c934a2 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -252,8 +252,6 @@ FIFOs file system MS-DOS file system .It Pa nfs/ C include files for NFS (Network File System) version 2, 3 and 4 -.It Pa ntfs/ -NTFS file system .It Pa nullfs/ loopback file system .It Pa procfs/ -- cgit v1.1 From aa4a438187bbd1a52ff79d31b1d61788ea5ba259 Mon Sep 17 00:00:00 2001 From: uqs Date: Sat, 20 Oct 2012 10:06:38 +0000 Subject: Apply local patches to mandoc and connect it to the build. - adds a couple more library strings used in the tree - changes some more to the current groff spelling - changes page footer to match groff style --- share/man/man7/hier.7 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share/man/man7') diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 0c934a2..25b1566 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -546,6 +546,8 @@ see .Xr setlocale 3 .It Pa man/ manual pages +.It Pa mdocml/ +data files used by mdocml .It Pa me/ macros for use with the me macro package; see -- cgit v1.1 From 8412efbea82a893c704af85b8b51e68d1fdc217c Mon Sep 17 00:00:00 2001 From: marcel Date: Mon, 22 Oct 2012 01:18:41 +0000 Subject: Add ATF to the build. This is may be a bit rought around the egdes, but committing it helps to get everyone on the same page and makes sure we make progress. Tinderbox breakages that are the result of this commit are entirely the committer's fault -- in other words: buildworld testing on amd64 only. Credits follow: Submitted by: Garrett Cooper Sponsored by: Isilon Systems Based on work by: keramida@ Thanks to: gnn@, mdf@, mlaier@, sjg@ Special thanks to: keramida@ --- share/man/man7/Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'share/man/man7') diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile index 011fbaf..8417934 100644 --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ +.include + #MISSING: eqnchar.7 ms.7 term.7 MAN= adding_user.7 \ ascii.7 \ @@ -34,4 +36,17 @@ MLINKS+= c99.7 c78.7 MLINKS+= c99.7 c89.7 MLINKS+= c99.7 c90.7 +.if ${MK_ATF} != "no" +ATF= ${.CURDIR}/../../../contrib/atf +.PATH: ${ATF}/doc +MAN+= atf.7 + +CLEANFILES+= atf.7 atf.7.tmp +atf.7: atf.7.in + sed -e 's,__DOCDIR__,${DOCDIR}/atf,g' \ + -e 's,__TESTSDIR__,${TESTSBASE},g' \ + < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} +.endif + .include -- cgit v1.1