git: e3f1471c22 - main - Porter's handbook: GPL licenses installation

The branch main has been updated by salvadore (ports committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=e3f1471c227dfc4a557286072a020e62856bf0d9

commit e3f1471c227dfc4a557286072a020e62856bf0d9
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2022-05-12 15:58:59 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-05-15 08:21:59 +0000

    Porter's handbook: GPL licenses installation
    
    - Revert commit bf9dfed44fd3ea2903e3fc732603a9b43eadf33a.
    - Remove note about avoiding installing GPL licenses from 13.20.
    
    Approved by:    portmgr (mat), doc (carlavilla), gerald (mentor)
    Differential Revision:  https://reviews.freebsd.org/D35127
---
 .../content/en/books/porters-handbook/makefiles/_index.adoc   | 11 ++++-------
 .../en/books/porters-handbook/porting-dads/_index.adoc        |  2 --
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc
index e0168a2792..10a76f01da 100644
--- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc
+++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc
@@ -2554,8 +2554,6 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 ....
 
-However, please do not use `LICENSE_FILE` for the GNU General Public License (`GPLv1`, `GPLv1+`, `GPL2`, `GPLv2+`, `GPLv3`, `GPLv3+`) to avoid installing on our systems multiple copies of the same identical files.
-
 ====
 
 For the predefined licenses, the default permissions are `dist-mirror dist-sell pkg-mirror pkg-sell auto-accept`.
@@ -3205,7 +3203,6 @@ LICENSE_PERMS=  dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 Full path to the file containing the license text, usually [.filename]#${WRKSRC}/some/file#.
 If the file is not in the distfile, and its content is too long to be put in <<licenses-license_text,`LICENSE_TEXT`>>, put it in a new file in [.filename]#${FILESDIR}#.
-Please do not use `LICENSE_FILE` for the GNU General Public License (`GPLv1`, `GPLv1+`, `GPL2`, `GPLv2+`, `GPLv3`, `GPLv3+`) to avoid installing on our systems multiple copies of the same identical files.
 
 [[licenses-license_file-ex1]]
 .`LICENSE_FILE`
@@ -3214,8 +3211,8 @@ Please do not use `LICENSE_FILE` for the GNU General Public License (`GPLv1`, `G
 
 [.programlisting]
 ....
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 ....
 
 ====
@@ -3297,10 +3294,10 @@ If license files are provided, use this:
 
 [.programlisting]
 ....
-LICENSE=	ART10 BSD2CLAUSE
+LICENSE=	ART10 GPLv1
 LICENSE_COMB=   dual
 LICENSE_FILE_ART10=     ${WRKSRC}/Artistic
-LICENSE_FILE_BSD2CLAUSE=     ${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1=     ${WRKSRC}/Copying
 ....
 
 ====
diff --git a/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc b/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc
index f04dfbe22f..36b9691d31 100644
--- a/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc
+++ b/documentation/content/en/books/porters-handbook/porting-dads/_index.adoc
@@ -547,6 +547,4 @@ For example, [.filename]#sys/types.h# is often forgotten, which is not as much o
 Always double-check [.filename]#pkg-descr# and [.filename]#pkg-plist#.
 If reviewing a port and a better wording can be achieved, do so.
 
-Do not copy more copies of the GNU General Public License into our system, please.
-
 Please be careful to note any legal issues! Do not let us illegally distribute software!