fold some of the useful "obsolete" information into the main text

1 files changed, 24 insertions, 26 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index a5066f71286..9ae3b93e6bb 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.563 2022/05/18 10:04:47 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.564 2022/05/20 10:39:24 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: May 18 2022 $
+.Dd $Mdocdate: May 20 2022 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -2178,7 +2178,14 @@ List of sites to try after normal master sites.
 Normally includes ${MASTER_SITE_OPENBSD} and ${MASTER_SITE_FREEBSD}.
 .It Ev MASTER_SITE_*
 Lists of standard sites to retrieve files from, refer to
-.Pa ${PORTSDIR}/infrastructure/db/network.conf .
+.Pa ${PORTSDIR}/infrastructure/db/network.conf
+for a complete list.
+.Pp
+Generally used with the standard
+.Xr make 1 Ns 's
+.Li ${VARIABLE:=subdir/}
+construct to append the relevant subdir at the end of each entry, e.g.,
+.Dl MASTER_SITES = ${MASTER_SITE_GNU:=cgicc/}
 .It Ev MASTER_SITES
 List of primary locations from which distribution files and patchfiles are
 retrieved.
@@ -3669,6 +3676,20 @@ as well as the sizes of these files.
 Cache of normal distribution files for a given port.
 .It Pa ${DISTDIR}/${MAKESUMFILES}
 Cache of all distribution files for a given port.
+.It Pa ${PORTSDIR}/infrastructure/mk/*.mk
+Actual location of the
+.Xr make 1
+glue for the ports tree.
+.Xr make 1
+looks for
+.Pa bsd.port.mk
+.Po
+and
+.Pa bsd.port.subdir.mk
+.Pc
+under
+.Pa /usr/share/mk/bsd.port.mk ,
+but that file is just a stub that redirects to the real location.
 .It Pa ${PKGDIR}/DESCR
 Description for the port.
 Variables such as ${HOMEPAGE} and ${MAINTAINER} will be expanded
@@ -4258,18 +4279,6 @@ to point to a script that does any required special treatment instead.
 .It Ev FETCH_DEPENDS
 Used to specify dependencies that were needed to fetch files.
 It is much easier to mirror locally weird distribution files.
-.It Ev MASTER_SITE_SUBDIR
-Contents were used to replace
-.Sq %SUBDIR%
-in all
-.Ev MASTER_SITES
-variables.
-Since
-.Sq %SUBDIR%
-almost always occur at the end of the directory,
-the simpler
-.Li ${VARIABLE:=subdir/}
-construct is now used instead
 .It Ev NO_EXTRACT
 Set EXTRACT_ONLY= instead.
 .It Ev NO_WRKDIR
@@ -4323,17 +4332,6 @@ See also
 and
 .Ev EXTRACT_SUFX .
 .El
-.Sh OBSOLETE FILES
-.Bl -tag -width Ds
-.It Pa /usr/share/mk/bsd.port.mk
-Original location of
-.Nm .
-The current file lives under
-.Pa ${PORTSDIR}/infrastructure/mk/bsd.port.mk ,
-whereas
-.Pa /usr/share/mk/bsd.port.mk
-is just a stub.
-.El
 .Sh SEE ALSO
 .Xr clean-old-distfiles 1 ,
 .Xr ftp 1 ,