handbooks: Remove references to portsnap

Although we are still generating portsnap deltas it is no longer the
recommended methods and git should be promoted. So remove references to
portsnap. Additionally

- Remove training whitespace
- Remove trailing consecutive blank lines

By no means this is an indication that portsnap is going to be removed
from the base or that portmgr@ is going to stop producing deltas. This
is just to demote the usages of portsnap and promote git.

PR:		264763
Approved by:	carlavilla (mentor)

documentation/content/en/articles/linux-users/_index.adoc

@@ -113,8 +113,8 @@ For more information on packages refer to section 5.4 of the FreeBSD Handbook: e
 The FreeBSD Ports Collection is a framework of [.filename]#Makefiles# and patches specifically customized for installing applications from source on FreeBSD.
 When installing a port, the system will fetch the source code, apply any required patches, compile the code, and install the application and any required dependencies.
 
-The Ports Collection, sometimes referred to as the ports tree, can be installed to [.filename]#/usr/ports# using man:portsnap[8].
-Detailed instructions for installing the Ports Collection can be found in extref:{handbook}[section 5.5, ports-using] of the FreeBSD Handbook.
+The Ports Collection, sometimes referred to as the ports tree, can be installed to [.filename]#/usr/ports# using link:{handbook}mirrors/#git[Git].
+Detailed instructions for installing the Ports Collection can be found in extref:{handbook}[section 4.5.1, ports-using-installation-methods] of the FreeBSD Handbook.
 
 To compile a port, change to the port's directory and start the build process. The following example installs Apache 2.4 from the Ports Collection:
 
@@ -141,10 +141,10 @@ Refer to extref:{handbook}[Using the Ports Collection, ports-using] for more inf
 Many Linux(R) distributions use the SysV init system, whereas FreeBSD uses the traditional BSD-style man:init[8].
 Under the BSD-style man:init[8], there are no run-levels and [.filename]#/etc/inittab# does not exist.
 Instead, startup is controlled by man:rc[8] scripts.
-At system boot, [.filename]#/etc/rc# reads [.filename]#/etc/rc.conf# and [.filename]#/etc/defaults/rc.conf# to determine which services are to be started. 
+At system boot, [.filename]#/etc/rc# reads [.filename]#/etc/rc.conf# and [.filename]#/etc/defaults/rc.conf# to determine which services are to be started.
 The specified services are then started by running the corresponding service initialization scripts located in [.filename]#/etc/rc.d/# and [.filename]#/usr/local/etc/rc.d/#. These scripts are similar to the scripts located in [.filename]#/etc/init.d/# on Linux(R) systems.
 
-The scripts found in [.filename]#/etc/rc.d/# are for applications that are part of the "base" system, such as man:cron[8], man:sshd[8], and man:syslog[3]. 
+The scripts found in [.filename]#/etc/rc.d/# are for applications that are part of the "base" system, such as man:cron[8], man:sshd[8], and man:syslog[3].
 The scripts in [.filename]#/usr/local/etc/rc.d/# are for user-installed applications such as Apache and Squid.
 
 Since FreeBSD is developed as a complete operating system, user-installed applications are not considered to be part of the "base" system.

documentation/content/en/books/handbook/jails/_index.adoc

@@ -401,7 +401,7 @@ The file system layout is as follows:
 This section describes the steps needed to create the master template.
 
 It is recommended to first update the host FreeBSD system to the latest -RELEASE branch using the instructions in crossref:cutting-edge[makeworld,“Updating FreeBSD from Source”].
-Additionally, this template uses the package:sysutils/cpdup[] package or port and portsnap will be used to download the FreeBSD Ports Collection.
+Additionally, this template uses the package:sysutils/cpdup[] package or port and link:{handbook}mirrors/#git[Git] will be used to download the FreeBSD Ports Collection.
 
 [.procedure]
 . First, create a directory structure for the read-only file system which will contain the FreeBSD binaries for the jails. Then, change directory to the FreeBSD source tree and install the read-only file system to the jail template:
@@ -419,7 +419,7 @@ Additionally, this template uses the package:sysutils/cpdup[] package or port an
 ....
 # cd /home/j/mroot
 # mkdir usr/ports
-# portsnap -p /home/j/mroot/usr/ports fetch extract
+# git clone -o freebsd https://git.FreeBSD.org/ports.git /home/j/mroot/usr/ports
 # cpdup /usr/src /home/j/mroot/usr/src
 ....
 

documentation/content/en/books/handbook/mirrors/_index.adoc

@@ -295,7 +295,7 @@ As of April 2021, FreeBSD uses git as the only version control system for storin
 [NOTE]
 ====
 Git is generally a developer tool.
-Users may prefer to use `freebsd-update` (crossref:cutting-edge[updating-upgrading-freebsdupdate,“FreeBSD Update”]) to update the FreeBSD base system, and `portsnap` (crossref:ports[ports-using,“Using the Ports Collection”]) to update the FreeBSD Ports Collection.
+Users may prefer to use `freebsd-update` (crossref:cutting-edge[updating-upgrading-freebsdupdate,“FreeBSD Update”]) to update the FreeBSD base system, and `git` (crossref:ports[ports-using,“Using the Ports Collection”]) to update the FreeBSD Ports Collection.
 ====
 
 This section demonstrates how to install Git on a FreeBSD system and use it to create a local copy of a FreeBSD source code repository.
@@ -430,7 +430,7 @@ As of April 2021, FreeBSD uses git as the only version control system for storin
 [NOTE]
 ====
 Subversion is generally a developer tool.
-Users may prefer to use `freebsd-update` (crossref:cutting-edge[updating-upgrading-freebsdupdate,“FreeBSD Update”]) to update the FreeBSD base system, and `portsnap` (crossref:ports[ports-using,“Using the Ports Collection”]) to update the FreeBSD Ports Collection.
+Users may prefer to use `freebsd-update` (crossref:cutting-edge[updating-upgrading-freebsdupdate,“FreeBSD Update”]) to update the FreeBSD base system, and `git` (crossref:ports[ports-using,“Using the Ports Collection”]) to update the FreeBSD Ports Collection.
 After March 2021, subversion use is only for legacy branches (`stable/11` and `stable/12`).
 ====
 

documentation/content/en/books/handbook/ports/_index.adoc

@@ -666,53 +666,6 @@ The extract portion of building a port will automatically save the downloaded so
 Before an application can be compiled using a port, the Ports Collection must first be installed.
 If it was not installed during the installation of FreeBSD, use one of the following methods to install it:
 
-[[ports-using-portsnap-method]]
-[.procedure]
-****
-*Procedure: Portsnap Method*
-
-The base system of FreeBSD includes Portsnap.
-This is a fast and user-friendly tool for retrieving the Ports Collection and is the recommended choice for most users not running FreeBSD-CURRENT.
-This utility connects to a FreeBSD 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.
-
-Note that Portsnap updates are generated from a snapshot of the main
-branch of the Ports Collection and cannot be configured to use a
-different branch (for example, `quarterly`).
-If it is necessary to use a different branch of the Ports Collection
-(for instance as referenced earlier in conjunction with binary
-packages), then the <<ports-using-git-method,Git method>> must be used.
-
-. To download a compressed snapshot of the Ports Collection into [.filename]#/var/db/portsnap#:
-+
-[source,shell]
-....
-# portsnap fetch
-....
-+
-. When running Portsnap for the first time, extract the snapshot into [.filename]#/usr/ports#:
-+
-[source,shell]
-....
-# portsnap extract
-....
-+
-. After the first use of Portsnap has been completed as shown above, [.filename]#/usr/ports# can be updated as needed by running:
-+
-[source,shell]
-....
-# portsnap fetch
-# portsnap update
-....
-+
-When using `fetch`, the `extract` or the `update` operation may be run consecutively, like so:
-+
-[source,shell]
-....
-# portsnap fetch update
-....
-****
-
 [[ports-using-git-method]]
 [.procedure]
 ****
@@ -945,7 +898,7 @@ Over time, newer versions of software become available in the Ports Collection.
 This section describes how to determine which software can be upgraded and how to perform the upgrade.
 
 To determine if newer versions of installed ports are available, ensure that the latest version of the ports tree is installed,
-using the updating command described in either <<ports-using-portsnap-method, “Portsnap Method”>> or <<ports-using-git-method, “Git Method”>>.
+using the updating command described in <<ports-using-git-method, “Git Method”>>.
 On FreeBSD 10 and later, or if the system has been converted to pkg, the following command will list the installed ports which are out of date:
 
 [source,shell]

documentation/content/en/books/porters-handbook/testing/_index.adoc

@@ -266,7 +266,6 @@ Choose a server location which is close, for example if the machine is located i
 
 `SVN_HOST`::
 The server from where jails are installed and updated when using Subversion.
-Also used for ports tree when not using man:portsnap[8].
 Again, choose a nearby location.
 A list of official Subversion mirrors can be found in the extref:{handbook}[FreeBSD Handbook Subversion section, svn-mirrors].
 
@@ -375,21 +374,14 @@ For example, if the building machine has 6 CPUs, use:
 === Setting Up Ports Trees for Use with Poudriere
 
 There are multiple ways to use ports trees in Poudriere.
-The most straightforward way is to have Poudriere create a default ports tree for itself, using either man:portsnap[8] (if running FreeBSD {rel121-current} or {rel114-current}) or Git (if running FreeBSD-CURRENT):
-
-[source,shell]
-....
-# poudriere ports -c -m portsnap
-....
-
-or
+The most straightforward way is to have Poudriere create a default ports tree for itself, using link:{handbook}mirrors/#git[Git]:
 
 [source,shell]
 ....
 # poudriere ports -c -m git+https -B main
 ....
 
-These commands create `tank/poudriere/ports/default`, mount it on [.filename]#/poudriere/ports/default#, and populate it using Git, man:portsnap[8], or Subversion.
+These commands create `tank/poudriere/ports/default`, mount it on [.filename]#/poudriere/ports/default#, and populate it using Git.
 Afterward it is included in the list of known ports trees:
 
 [source,shell]
@@ -406,7 +398,7 @@ Each of the build commands explained later will implicitly use this ports tree u
 To use another tree, add `-p _treename_` to the commands.
 ====
 
-While useful for regular bulk builds, having this default ports tree with the man:portsnap[8] method may not be the best way to deal with local modifications for a ports contributor.
+The best way to deal with local modifications for a ports contributor is to use link:{handbook}mirrors/#git[Git].
 As with the creation of jails, it is possible to use a different method for creating the ports tree.
 To add an additional ports tree for testing local modifications and ports development,
 checking out the tree via Subversion (as described above) is preferable.

website/content/en/ports/installing.adoc

@@ -15,4 +15,4 @@ include::shared/en/urls.adoc[]
 The FreeBSD installer programs allow the Ports Collection to be installed at the same time as the operating system.
 See link:{handbook}bsdinstall[installing FreeBSD].
 
-If not initially installed, it can be added with link:{handbook}ports/#ports-using-portsnap-method[portsnap] or link:{handbook}ports/#ports-using-git-method[Git].
+If not initially installed, it can be added with link:{handbook}ports/#ports-using-git-method[Git].