Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1692556718215780"
MIME-Version: 1.0
Date: Sun, 20 Aug 2023 18:38:38 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: tnn@netbsd.org
Message-Id: <20230820183838.116F5FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1692556718215780
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Sun Aug 20 18:38:37 UTC 2023

Modified Files:
	pkgsrc/mk: bsd.pkg.mk
	pkgsrc/mk/package: package.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2052 -r1.2053 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/package/package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1692556718215780
Content-Disposition: inline
Content-Length: 2332
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2052 pkgsrc/mk/bsd.pkg.mk:1.2053
--- pkgsrc/mk/bsd.pkg.mk:1.2052	Sun Aug 20 16:50:12 2023
+++ pkgsrc/mk/bsd.pkg.mk	Sun Aug 20 18:38:37 2023
@@ -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))

Index: pkgsrc/mk/package/package.mk
diff -u pkgsrc/mk/package/package.mk:1.29 pkgsrc/mk/package/package.mk:1.30
--- pkgsrc/mk/package/package.mk:1.29	Sun Aug 20 16:50:12 2023
+++ pkgsrc/mk/package/package.mk	Sun Aug 20 18:38:37 2023
@@ -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


--_----------=_1692556718215780--