Remove references to portsnap for newer FreeBSD versions.

Provide instructions around the existing references for portsnap about how to
fetch ports for FreeBSD versions after 12.1 or 11.4, respectively.

While here:
- replace a stray public address with a RFC1918 private address
- move a plural outside of the <filename> tags
- update FreeBSD versions in poudriere examples

Submitted by:	    pauamma_gundo.com
Approved by:	    bcr
Differential Revision:	https://reviews.freebsd.org/D25800

1 files changed, 60 insertions, 57 deletions

diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index b5ec30a7ca..c7b834a556 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -829,7 +829,7 @@ security/sudo</screen>
     <title>Using the Ports Collection</title>
 
     <para>The Ports Collection is a set of
-      <filename>Makefiles</filename>, patches, and description files.
+      <filename>Makefile</filename>s, patches, and description files.
       Each set of these files is used to compile and install an
       individual application on &os;, and is called a
       <emphasis>port</emphasis>.</para>
@@ -848,7 +848,8 @@ security/sudo</screen>
       <para>The base system of &os; includes
 	<application>Portsnap</application>.  This is a fast and
 	user-friendly tool for retrieving the Ports Collection and
-	is the recommended choice for most users.  This utility
+	is the recommended choice for most users not running
+	&os.current;.  This utility
 	connects to a &os; site, verifies the secure key, and
 	downloads a new copy of the Ports Collection.  The key is used
 	to verify the integrity of all downloaded files.</para>
@@ -890,7 +891,7 @@ security/sudo</screen>
       <title>Subversion Method</title>
 
       <para>If more control over the ports tree is needed or if local
-	changes need to be maintained,
+	changes need to be maintained, or if running &os.current;,
 	<application>Subversion</application> can be used to obtain
 	the Ports Collection.  Refer to <link
 	  xlink:href="&url.articles.committers-guide;/subversion-primer.html">the
@@ -1563,52 +1564,54 @@ The deinstallation will free 229 kB
 	<literal>amd64</literal>.  The default is the
 	architecture shown by <command>uname</command>.</para>
 
-      <screen>&prompt.root; <userinput>poudriere jail -c -j <replaceable>10amd64</replaceable> -v <replaceable>10.0-RELEASE</replaceable></userinput>
-====&gt;&gt; Creating 10amd64 fs... done
-====&gt;&gt; Fetching base.txz for FreeBSD 10.0-RELEASE amd64
-/poudriere/jails/10amd64/fromftp/base.txz      100% of   59 MB 1470 kBps 00m42s
-====&gt;&gt; Extracting base.txz... done
-====&gt;&gt; Fetching src.txz for FreeBSD 10.0-RELEASE amd64
-/poudriere/jails/10amd64/fromftp/src.txz       100% of  107 MB 1476 kBps 01m14s
-====&gt;&gt; Extracting src.txz... done
-====&gt;&gt; Fetching games.txz for FreeBSD 10.0-RELEASE amd64
-/poudriere/jails/10amd64/fromftp/games.txz     100% of  865 kB  734 kBps 00m01s
-====&gt;&gt; Extracting games.txz... done
-====&gt;&gt; Fetching lib32.txz for FreeBSD 10.0-RELEASE amd64
-/poudriere/jails/10amd64/fromftp/lib32.txz     100% of   14 MB 1316 kBps 00m12s
-====&gt;&gt; Extracting lib32.txz... done
-====&gt;&gt; Cleaning up... done
-====&gt;&gt; Jail 10amd64 10.0-RELEASE amd64 is ready to be used</screen>
-
-      <screen>&prompt.root; <userinput>poudriere ports -c -p <replaceable>local</replaceable></userinput>
-====&gt;&gt; Creating local fs... done
-====&gt;&gt; Extracting portstree "local"...
-Looking up portsnap.FreeBSD.org mirrors... 7 mirrors found.
-Fetching public key from ec2-eu-west-1.portsnap.freebsd.org... done.
-Fetching snapshot tag from ec2-eu-west-1.portsnap.freebsd.org... done.
-Fetching snapshot metadata... done.
-Fetching snapshot generated at Tue Feb 11 01:07:15 CET 2014:
-94a3431f0ce567f6452ffde4fd3d7d3c6e1da143efec76100% of   69 MB 1246 kBps 00m57s
-Extracting snapshot... done.
-Verifying snapshot integrity... done.
-Fetching snapshot tag from ec2-eu-west-1.portsnap.freebsd.org... done.
-Fetching snapshot metadata... done.
-Updating from Tue Feb 11 01:07:15 CET 2014 to Tue Feb 11 16:05:20 CET 2014.
-Fetching 4 metadata patches... done.
-Applying metadata patches... done.
-Fetching 0 metadata files... done.
-Fetching 48 patches.
-(48/48) 100.00%  done.
-done.
-Applying patches...
-done.
-Fetching 1 new ports or files... done.
-/poudriere/ports/tester/CHANGES
-/poudriere/ports/tester/COPYRIGHT
-
-[...]
-
-Building new INDEX files... done.</screen>
+      <screen>&prompt.root; <userinput>poudriere jail -c -j <replaceable>11amd64</replaceable> -v <replaceable>11.4-RELEASE</replaceable></userinput>
+[00:00:00] Creating 11amd64 fs at /poudriere/jails/11amd64... done
+[00:00:00] Using pre-distributed MANIFEST for FreeBSD 11.4-RELEASE amd64
+[00:00:00] Fetching base for FreeBSD 11.4-RELEASE amd64
+/poudriere/jails/11amd64/fromftp/base.txz              125 MB 4110 kBps    31s
+[00:00:33] Extracting base... done
+[00:00:54] Fetching src for FreeBSD 11.4-RELEASE amd64
+/poudriere/jails/11amd64/fromftp/src.txz               154 MB 4178 kBps    38s
+[00:01:33] Extracting src... done
+[00:02:31] Fetching lib32 for FreeBSD 11.4-RELEASE amd64
+/poudriere/jails/11amd64/fromftp/lib32.txz              24 MB 3969 kBps    06s
+[00:02:38] Extracting lib32... done
+[00:02:42] Cleaning up... done
+[00:02:42] Recording filesystem state for clean... done
+[00:02:42] Upgrading using ftp
+/etc/resolv.conf -&gt; /poudriere/jails/11amd64/etc/resolv.conf
+Looking up update.FreeBSD.org mirrors... 3 mirrors found.
+Fetching public key from update4.freebsd.org... done.
+Fetching metadata signature for 11.4-RELEASE from update4.freebsd.org... done.
+Fetching metadata index... done.
+Fetching 2 metadata files... done.
+Inspecting system... done.
+Preparing to download files... done.
+Fetching 124 patches.....10....20....30....40....50....60....70....80....90....100....110....120.. done.
+Applying patches... done.
+Fetching 6 files... done.
+The following files will be added as part of updating to
+11.4-RELEASE-p1:
+/usr/src/contrib/unbound/.github
+/usr/src/contrib/unbound/.github/FUNDING.yml
+/usr/src/contrib/unbound/contrib/drop2rpz
+/usr/src/contrib/unbound/contrib/unbound_portable.service.in
+/usr/src/contrib/unbound/services/rpz.c
+/usr/src/contrib/unbound/services/rpz.h
+/usr/src/lib/libc/tests/gen/spawnp_enoexec.sh
+The following files will be updated as part of updating to
+11.4-RELEASE-p1:
+[&hellip;]
+Installing updates...Scanning //usr/share/certs/blacklisted for certificates...
+Scanning //usr/share/certs/trusted for certificates...
+ done.
+11.4-RELEASE-p1
+[00:04:06] Recording filesystem state for clean... done
+[00:04:07] Jail 11amd64 11.4-RELEASE-p1 amd64 is ready to be used</screen>
+
+      <screen>&prompt.root; <userinput>poudriere ports -c -p <replaceable>local</replaceable> -m svn+https</userinput>
+[00:00:00] Creating local fs at /poudriere/ports/local... done
+[00:00:00] Checking out the ports tree... done</screen>
 
       <para>On a single computer, <application>poudriere</application>
 	can build ports with multiple configurations, in multiple
@@ -1625,13 +1628,13 @@ Building new INDEX files... done.</screen>
 	  >/usr/local/etc/poudriere.d</filename>.
 	The filename in this example is created by combining the jail
 	name, port name, and set name:
-	<filename><replaceable>10amd64-local-workstation</replaceable>-make.conf</filename>.
+	<filename><replaceable>11amd64-local-workstation</replaceable>-make.conf</filename>.
 	The system <filename>make.conf</filename> and this new file
 	are combined at build time to create the
 	<filename>make.conf</filename> used by the build jail.</para>
 
       <para>Packages to be built are entered in
-	<filename><replaceable>10amd64-local-workstation</replaceable>-pkglist</filename>:</para>
+	<filename><replaceable>11amd64-local-workstation</replaceable>-pkglist</filename>:</para>
 
       <programlisting>editors/emacs
 devel/git
@@ -1641,12 +1644,12 @@ ports-mgmt/pkg
       <para>Options and dependencies for the specified ports are
 	configured:</para>
 
-      <screen>&prompt.root; <userinput>poudriere options -j <replaceable>10amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>10amd64-local-workstation-pkglist</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>poudriere options -j <replaceable>10amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>11amd64-local-workstation-pkglist</replaceable></userinput></screen>
 
       <para>Finally, packages are built and a package
 	repository is created:</para>
 
-      <screen>&prompt.root; <userinput>poudriere bulk -j <replaceable>10amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>10amd64-local-workstation-pkglist</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>poudriere bulk -j <replaceable>11amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>11amd64-local-workstation-pkglist</replaceable></userinput></screen>
 
       <para>While running, pressing <keycombo
 	  action="simul"><keycap>Ctrl</keycap><keycap>t</keycap></keycombo>
@@ -1684,18 +1687,18 @@ ports-mgmt/pkg
       <para>Usually it is easiest to serve a poudriere repository to
 	the client machines via HTTP.  Set up a webserver to serve up
 	the package directory, for instance:
-	<filename>/usr/local/poudriere/data/packages/<replaceable>10amd64</replaceable></filename>,
-	where <filename><replaceable>10amd64</replaceable></filename>
+	<filename>/usr/local/poudriere/data/packages/<replaceable>11amd64</replaceable></filename>,
+	where <filename><replaceable>11amd64</replaceable></filename>
 	is the name of the build.</para>
 
       <para>If the URL to the package repository is:
-	<literal>http://pkg.example.com/10amd64</literal>, then the
+	<literal>http://pkg.example.com/11amd64</literal>, then the
 	repository configuration file in
 	<filename>/usr/local/etc/pkg/repos/custom.conf</filename>
 	would look like:</para>
 
       <programlisting>custom: {
-	url: "<replaceable>http://pkg.example.com/10amd64</replaceable>",
+	url: "<replaceable>http://pkg.example.com/11amd64</replaceable>",
 	enabled: yes,
 }</programlisting>
     </sect2>