diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml index 315507055d..0b9c5cfc44 100644 --- a/en_US.ISO8859-1/books/porters-handbook/book.sgml +++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml @@ -3432,13 +3432,20 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar It is your responsibility as a porter to read the licensing terms of the software and make sure that the FreeBSD project will not be held accountable for violating them by redistributing the - source or compiled binaries either via FTP or CDROM. If in doubt, + source or compiled binaries either via FTP/HTTP or CD-ROM. If in doubt, please contact the &a.ports;. - In situations like this, the following variables can be set. In - addition, ports/LEGAL should also be - updated. + In situations like this, the variables described in the following + sections can be set. + + + RESTRICTED implies NO_CDROM + and NO_PACKAGE, so it should be set alone. + On the contrary, NO_PACKAGE and + NO_CDROM are independent and can be set + simultaneously. + <makevar>NO_PACKAGE</makevar> @@ -3461,39 +3468,47 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar <makevar>NO_CDROM</makevar> - This variable indicates that although we are allowed to generate + This variable indicates that, although we are allowed to generate binary packages, we are not allowed to put those packages, or the - port's DISTFILES, onto a CDROM (or DVD-ROM) - for resale. The - DISTFILES will still be available via FTP - (or HTTP if you set it up that way.) + port's DISTFILES, onto a CD-ROM (or DVD-ROM) + for resale. However, the binary packages and the port's + DISTFILES will still be available via + FTP/HTTP. - NO_PACKAGE and NO_CDROM - can be set simultaneously. + NO_CDROM should be set to a string + describing the reason why the port cannot be redistributed + on CD-ROM. For instance, this should be used if the port's license + is for non-commercial use only. <makevar>RESTRICTED</makevar> - Set this variable if the application's license also forbids us - from mirroring the application's DISTFILES via - FTP (or HTTP if you set it up that way.) + Set this variable if the application's license forbids us + from mirroring the application's DISTFILES and + distributing the binary package via FTP/HTTP or CD-ROM. - Also set this if the application's license has general - restrictions on who may use it, e.g. the application is for - non-commercial use only. - - Note that the port committer should add an entry to - /usr/ports/LEGAL describing exactly - what the restriction entails. + RESTRICTED should be set to a string + describing the reason why the port cannot be redistributed. + Typically, this indicates that the port contains proprietary + software and that the user will need to manually download the + DISTFILES, possibly after registering for the + software or agreeing to accept the terms of an + EULA. <makevar>RESTRICTED_FILES</makevar> - If only some of the distribution files are restricted then set - this variable to list them. It defaults to ${DISTFILES} - ${PATCHFILES}. + When RESTRICTED or NO_CDROM + is set, this variable defaults to ${DISTFILES} + ${PATCHFILES}, otherwise it is empty. If only some of the + distribution files are restricted, then set this variable to list + them. + + Note that the port committer should add an entry to + /usr/ports/LEGAL for every listed distribution + file, describing exactly what the restriction entails.