reflect reality better.

DEF_UMASK will die.

1 files changed, 86 insertions, 31 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 3d3209cfc83..cea20e867dd 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.299 2011/11/21 12:57:17 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.300 2011/11/22 14:24:33 espie Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 21 2011 $
+.Dd $Mdocdate: November 22 2011 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -649,6 +649,11 @@ will automatically recognize and handle such lines correctly.
 .Pp
 .Ar update-plist
 does not handle flavor situations yet, so beware.
+.It Ar verbose-show
+Similar to
+.Ar show ,
+except that it prefixes each value with the variable name, e.g.
+.Li VAR=value
 .El
 .Sh VARIABLES
 Note that some variables are marked as
@@ -715,7 +720,17 @@ can be used to specify what packages to depend upon.
 Full
 .Xr pkgpath 7
 to the current port, taking flavors into account.
+See also
+.Ev BUILD_PKGPATH ,
+which also includes pseudo-flavors.
 Read-only.
+.It Ev BASESYSCONFDIR
+User settings.
+Base location for system-wide configuration files.
+Defaults to
+.Pa /etc .
+See
+.Ev SYSCONFDIR .
 .It Ev BATCH
 User-settings.
 Set to
@@ -754,19 +769,22 @@ Each item has the form
 defaults to
 .Sq install
 if it is not specified.
-.Sq legacy
-used to be a file to check.
-The ports tree now uses
-.Sq pkgspec
-instead, as a package that must be installed prior to the build.
-.Sq directory
-is set relative to ${PORTSDIR}.
-.Sq subpackage
-is an optional subpackage name, to install instead of the default main
-package name.
-.Sq flavor ...
-is a comma separated list of flavors.
-By default, the dependency will build the default flavor.
+The package installed must conform to the
+.Sq pkgspec ,
+which is by default obtained from the dependent
+.Sq pkgpath
+.Po
+see
+.Ev PKGSPEC
+.Pc .
+If no installation is involved, the infrastructure will still check
+that the directory would provide a package conforming to the
+.Sq pkgspec .
+.Sq pkgpath
+is set relative to ${PORTSDIR},
+see
+.Xr pkgpath 7
+for details.
 Build dependencies are checked at the beginning of the extract stage.
 .Pp
 Build dependencies that are not the default
@@ -780,9 +798,16 @@ Full
 .Xr pkgpath 7
 to the current port, taking flavors and pseudo-flavors
 into account.
+See also
+.Ev BASE_PKGPATH ,
+which doesn't include pseudo-flavors.
 Mostly useful to write dependencies for subpackages like this:
 .Li "LIB_DEPENDS-foo=${BUILD_PKGPATH}"
 and avoid starting to build a package with some other flavor combination.
+See
+.Xr pkgpath 7
+on the subject of 
+.Sq pkgpath normalisation .
 Read-only.
 .It Ev BULK
 User settings.
@@ -869,6 +894,9 @@ If set to
 .Sq Yes ,
 every package build will verify that shared libraries are correctly
 registered.
+This is essentially the same as running make on
+.Ar lib-depends-check
+after each package build.
 Defaults to
 .Sq \&No ,
 as this can be a big performance hit.
@@ -1004,13 +1032,6 @@ Many ports ignore it.
 .It Ev CXXOPTS
 User settings.
 Supplementary options appended to ${CXXFLAGS} for building.
-.It Ev DEF_UMASK
-Correct value of umask for the port to build and package correctly.
-Tested against the actual umask at
-.Ar fake
-time.
-Default is 022.
-Don't override.
 .It Ev DESTDIR
 See
 .Ev DESTDIRNAME .
@@ -1306,7 +1327,7 @@ to package installation time.
 .It Ev LIB_DEPENDS
 Libraries this port depends upon.
 Each item has the form
-.Sq [pkgspec:]directory[,-subpackage][,flavor ...] .
+.Sq [pkgspec:]pkgpath .
 Similar to
 .Ev BUILD_DEPENDS
 and
@@ -1500,6 +1521,13 @@ See also
 .Ev IGNORE .
 .It Ev NO_REGRESS
 Port does not have any regression targets.
+Only set to
+.Sq Yes
+for ports with no regression targets.
+It should be left alone for ports with empty regression targets, and for
+ports with failing tests.
+That way, if a subsequent update of a port acquires actual regression tests,
+they will be picked up automatically.
 .It Ev NO_SHARED_ARCHS
 Set to the list of platforms that do not support shared libraries.
 Use with
@@ -1683,6 +1711,12 @@ command, with possible options.
 Path to
 .Xr pkg_info 1
 command, with possible options.
+.It Ev PKG_TMPDIR
+See
+.Xr pkg_add 1 .
+Normally points to
+.Pa /var/tmp ,
+as per default.
 .It Ev PORTHOME
 Setting of env variable
 .Ev HOME
@@ -1816,6 +1850,12 @@ architecture has no shared library support.
 .It mono
 there is mono support on this architecture.
 .El
+.It Ev PSEUDO_FLAVOR
+list of flavors in
+.Ev FLAVOR
+that are actually pseudo-flavors.
+Only for introspection purposes.
+Read-only.
 .It Ev PSEUDO_FLAVORS
 Extra list of flavors that do not register in package names, but are still
 used to control build logic, and e.g., working directory names.
@@ -1862,6 +1902,9 @@ Location for daemon startup scripts.
 Defaults to
 .Pa /etc/rc.d .
 Do not change.
+.It Ev RECURSIVE_FETCH_LIST
+See
+.Xr mirroring-ports 7 .
 .It Ev REFETCH
 User settings.
 If set to true,
@@ -2085,11 +2128,12 @@ is admissible, and in fact, expected, as it is much simpler to build
 an error-free list of files to retrieve in that way.
 See the xanim port for an example.
 .It Ev SYSCONFDIR
-Location for ports system configuration files.
-Defaults to
-.Pa /etc ,
-should never be set to
-.Pa /usr/local/etc .
+Location for this port's configuration files, should always be derived
+from
+.Ev BASESYSCONFDIR ,
+which defaults to
+.Pa /etc .
+Passed to gnu configure scripts and substituted in PLISTs.
 .It Ev SYSTRACE_FILTER
 Location of the systrace filter file which is the basis for a port's
 actual systrace policy file.
@@ -2110,6 +2154,7 @@ Read-only.
 Set to the list of special targets for a port
 .Po
 .Ar {pre,do,post}-*
+and module hooks
 .Pc .
 Used by introspection tools such as the sqlports package.
 .It Ev TEMPLATES
@@ -2117,6 +2162,16 @@ Base location for the templates used in the
 .Ar readmes
 target.
 User settings.
+Defaults to
+.Pa ${PORTSDIR}/infrastructure/templates .
+.It Ev TRUE_PREFIX
+Read-only.
+Mostly the same as ${PREFIX}, except it never gets ${DESTDIR} prepended
+during
+.Ar fake .
+Refer to
+.Qq THE FAKE FRAMEWORK
+for details.
 .It Ev TRUST_PACKAGES
 User settings.
 If set to
@@ -2467,7 +2522,6 @@ Base location where packages suitable for FTP (see
 PERMIT_PACKAGE_FTP) will be placed.
 Now hardwired to
 .Pa ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/ftp .
-(default: ${PKGREPOSITORYBASE}/ftp)
 .It Ev GNU_CONFIGURE
 Use
 .Ev CONFIGURE_STYLE
@@ -2585,8 +2639,9 @@ Use
 .Ev OSREV
 instead.
 .It Ev PACKAGES
-Base location for packages built, renamed
-.Ev PKGREPOSITORYBASE .
+Base location for packages built, everything is based on
+.Ev PACKAGE_REPOSITORY
+now.
 .It Ev PACKAGING
 Used to be set during package creation, so that the port would test it
 to tweak some settings at this point.