diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc --- 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_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 @@ 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 <>, 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 @@ [.programlisting] .... -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING .... ==== @@ -3297,10 +3294,10 @@ [.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 --- 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 @@ 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!