CVS commit: pkgsrc/mk

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 20 16:50:12 UTC 2023

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

Log Message:
mk: make NO_BIN_ON_* warning messages agnostic of technology

Replace references to "CD-ROM" and "FTP" with "physical media" and
"public networks".

Use the word "shared" instead of "placed". No license prevents the
user from placing binary packages on physical media for personal use.

If NO_BIN_ON_CDROM and NO_BIN_ON_FTP are both set and the reason is
the same, as is the case for most restricted packages, then only warn
once during the package phase to cut down noise.


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

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

Modified files:

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2051 pkgsrc/mk/bsd.pkg.mk:1.2052
--- pkgsrc/mk/bsd.pkg.mk:1.2051 Tue Jun 27 10:27:20 2023
+++ pkgsrc/mk/bsd.pkg.mk        Sun Aug 20 16:50:12 2023
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2051 2023/06/27 10:27:20 riastradh Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2052 2023/08/20 16:50:12 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 placed in binary form on a CDROM:" \
+       "${PKGNAME} may not be shared 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 placed in source form on a CDROM:" \
+       "${PKGNAME} may not be shared 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.28 pkgsrc/mk/package/package.mk:1.29
--- pkgsrc/mk/package/package.mk:1.28   Wed Nov 23 13:30:38 2022
+++ pkgsrc/mk/package/package.mk        Sun Aug 20 16:50:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.28 2022/11/23 13:30:38 jperkin Exp $
+# $NetBSD: package.mk,v 1.29 2023/08/20 16:50:12 tnn Exp $
 #
 # This file provides the code for the "package" phase.
 #
@@ -105,13 +105,21 @@ package-create:
 # Displays warnings about the binary package.
 #
 _package-warnings: .PHONY
-.if defined(NO_BIN_ON_CDROM)
-       @${WARNING_MSG} "${PKGNAME} may not be put on a CD-ROM:"
+.if defined(NO_BIN_ON_CDROM) && defined(NO_BIN_ON_FTP)
+       @${WARNING_MSG} "${PKGNAME} may not be shared electronically:"
        @${WARNING_MSG} ${NO_BIN_ON_CDROM:Q}
-.endif
-.if defined(NO_BIN_ON_FTP)
-       @${WARNING_MSG} "${PKGNAME} may not be made available through FTP:"
+.  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} ${NO_BIN_ON_CDROM:Q}
+.  endif
+.  if defined(NO_BIN_ON_FTP)
+       @${WARNING_MSG} "${PKGNAME} may not be shared on public networks:"
+       @${WARNING_MSG} ${NO_BIN_ON_FTP:Q}
+.  endif
 .endif
 .if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo])
        @${WARNING_MSG} "ABI dependency recommendations are being ignored!"