kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-word previous 

Mention distribution explicitly rather than the simpler term sharing
since the restriction usually comes from a redistribution clause in the
package's license.
This commit is contained in:
tnn 2023-08-20 18:38:37 +00:00
parent 48fc54675c
commit 76c31ac6f3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/bsd.pkg.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.2052 2023/08/20 16:50:12 tnn Exp $
# $NetBSD: bsd.pkg.mk,v 1.2053 2023/08/20 18:38:37 tnn Exp $
#
# This file is in the public domain.
#
@ -470,12 +470,12 @@ X11BASE:= /usr
.if !defined(NO_SKIP)
. if (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM))
PKG_SKIP_REASON+= \
"${PKGNAME} may not be shared on physical media in binary form:" \
"${PKGNAME} may not be distributed on physical media in binary form:" \
" "${NO_BIN_ON_CDROM:Q}
. endif
. if (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM))
PKG_SKIP_REASON+= \
"${PKGNAME} may not be shared on physical media in source form:" \
"${PKGNAME} may not be distributed on physical media in source form:" \
" "${NO_SRC_ON_CDROM:Q}
. endif
. if (defined(RESTRICTED) && defined(NO_RESTRICTED))

8
mk/package/package.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: package.mk,v 1.29 2023/08/20 16:50:12 tnn Exp $
# $NetBSD: package.mk,v 1.30 2023/08/20 18:38:37 tnn Exp $
#
# This file provides the code for the "package" phase.
#
@ -106,18 +106,18 @@ package-create:
#
_package-warnings: .PHONY
.if defined(NO_BIN_ON_CDROM) && defined(NO_BIN_ON_FTP)
@${WARNING_MSG} "${PKGNAME} may not be shared electronically:"
@${WARNING_MSG} "${PKGNAME} may not be distributed electronically:"
@${WARNING_MSG} ${NO_BIN_ON_CDROM:Q}
. if ${NO_BIN_ON_FTP} != ${NO_BIN_ON_CDROM}
@${WARNING_MSG} ${NO_BIN_ON_FTP:Q}
. endif
.else
. if defined(NO_BIN_ON_CDROM)
@${WARNING_MSG} "${PKGNAME} may not be shared on physical media:"
@${WARNING_MSG} "${PKGNAME} may not be distributed on physical media:"
@${WARNING_MSG} ${NO_BIN_ON_CDROM:Q}
. endif
. if defined(NO_BIN_ON_FTP)
@${WARNING_MSG} "${PKGNAME} may not be shared on public networks:"
@${WARNING_MSG} "${PKGNAME} may not be distributed via public networks:"
@${WARNING_MSG} ${NO_BIN_ON_FTP:Q}
. endif
.endif