I'm fed up with having to waste time because PKG_DEVELOPER is "special" and

can't be disabled by setting it to "no" like the other variables.
Besides, flavor/pkg/metadata.mk has been expecting for a long time that "no"
is a valid value.

Make PKG_DEVELOPER DWIM.

15 files changed, 38 insertions, 38 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a1210ac6e37..cac423727f8 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1973 2010/07/03 04:27:00 darcy Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1974 2010/08/24 19:08:28 bad Exp $
 #
 # This file is in the public domain.
 #
@@ -778,7 +778,7 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
 .include "pbulk/pbulk-index.mk"
 .endif
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 .  include "misc/developer.mk"
 .endif
 .include "misc/show.mk"
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 3093b846b93..445b6f839a1 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.310 2010/05/19 09:12:15 sbd Exp $
+# $NetBSD: bsd.prefs.mk,v 1.311 2010/08/24 19:08:28 bad Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -413,7 +413,7 @@ do-install:
 .endif
 
 # PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir".
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 USE_DESTDIR?=		yes
 .else
 USE_DESTDIR?=		no
@@ -433,7 +433,7 @@ _USE_DESTDIR=		destdir
 PKG_FAIL_REASON+=	"PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''."
 .endif
 
-.if defined(PKG_DEVELOPER) && empty(PKG_DESTDIR_SUPPORT)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" && empty(PKG_DESTDIR_SUPPORT)
 WARNINGS+=	"[bsd.prefs.mk] The package ${PKGNAME} is missing DESTDIR support."
 .endif
 
diff --git a/mk/check/check-fakehome.mk b/mk/check/check-fakehome.mk
index fb047a97730..6425ae17a84 100644
--- a/mk/check/check-fakehome.mk
+++ b/mk/check/check-fakehome.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-fakehome.mk,v 1.2 2008/02/05 11:17:00 tnn Exp $
+# $NetBSD: check-fakehome.mk,v 1.3 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks that the package does not install files to $HOME.
 #
@@ -19,7 +19,7 @@ _USER_VARS.check-fakehome=	CHECK_FAKEHOME
 _PKG_VARS.check-fakehome=	# None for now. One might be added to override
 #				  the test if the fakehome test is made fatal.
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_FAKEHOME?=		yes
 .else
 CHECK_FAKEHOME?=		no
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk
index de8f95a202e..e02ba159571 100644
--- a/mk/check/check-files.mk
+++ b/mk/check/check-files.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.26 2009/10/21 18:00:00 tnn Exp $
+# $NetBSD: check-files.mk,v 1.27 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks that the list of installed files matches the PLIST.
 # For that purpose it records the file list of LOCALBASE before and
@@ -29,7 +29,7 @@ _VARGROUPS+=		check-files
 _USER_VARS.check-files=	CHECK_FILES CHECK_FILES_STRICT
 _PKG_VARS.check-files=	CHECK_FILES_SKIP
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_FILES?=		yes
 .endif
 CHECK_FILES?=		no
diff --git a/mk/check/check-headers.mk b/mk/check/check-headers.mk
index 81c92dbdc12..80638dda033 100644
--- a/mk/check/check-headers.mk
+++ b/mk/check/check-headers.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-headers.mk,v 1.5 2008/02/20 10:43:55 rillig Exp $
+# $NetBSD: check-headers.mk,v 1.6 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks the C and C++ header files for possible problems.
 #
@@ -19,7 +19,7 @@ _VARGROUPS+=			check-headers
 _USER_VARS.check-headers=	CHECK_HEADERS
 _PKG_VARS.check-headers=	CHECK_HEADERS_SKIP
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 # still experimental
 #CHECK_HEADERS?=		yes
 .endif
diff --git a/mk/check/check-interpreter.mk b/mk/check/check-interpreter.mk
index 8e9526d2e39..32a81322d1c 100644
--- a/mk/check/check-interpreter.mk
+++ b/mk/check/check-interpreter.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-interpreter.mk,v 1.23 2008/02/13 08:33:08 rillig Exp $
+# $NetBSD: check-interpreter.mk,v 1.24 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks that after installation, all files of the package
 # that start with a "#!" line will find their interpreter. Files that
@@ -23,7 +23,7 @@
 #	Example: share/package1/* share/package2/somefile
 #
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_INTERPRETER?=		yes
 .else
 CHECK_INTERPRETER?=		no
diff --git a/mk/check/check-perms.mk b/mk/check/check-perms.mk
index 55bd80a2e5b..53394611cd8 100644
--- a/mk/check/check-perms.mk
+++ b/mk/check/check-perms.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-perms.mk,v 1.12 2008/06/22 22:05:19 joerg Exp $
+# $NetBSD: check-perms.mk,v 1.13 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks that after installation of a package, all files and
 # directories of that package have sensible permissions set.
@@ -35,7 +35,7 @@ _VARGROUPS+=		check-perms
 _USER_VARS.check-perms=	CHECK_PERMS
 _PKG_VARS.check-perms=	CHECK_PERMS_SKIP CHECK_PERMS_AUTOSKIP
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_PERMS?=		yes
 .else
 CHECK_PERMS?=		no
diff --git a/mk/check/check-portability.mk b/mk/check/check-portability.mk
index 03482ff4dd7..3eba80c0a1d 100644
--- a/mk/check/check-portability.mk
+++ b/mk/check/check-portability.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.mk,v 1.6 2008/02/20 10:43:55 rillig Exp $
+# $NetBSD: check-portability.mk,v 1.7 2010/08/24 19:08:29 bad Exp $
 #
 # This file contains some checks that are applied to the configure
 # scripts to check for certain constructs that are known to cause
@@ -33,7 +33,7 @@ _VARGROUPS+=			check-portability
 _USER_VARS.check-portability=	CHECK_PORTABILITY
 _PKG_VARS.check-portability=	CHECK_PORTABILITY_SKIP
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_PORTABILITY?=		yes
 .endif
 CHECK_PORTABILITY?=		no
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk
index 639660d5922..7aedf51b905 100644
--- a/mk/check/check-shlibs.mk
+++ b/mk/check/check-shlibs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.17 2010/02/02 15:36:15 tnn Exp $
+# $NetBSD: check-shlibs.mk,v 1.18 2010/08/24 19:08:29 bad Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -22,7 +22,7 @@ _VARGROUPS+=			check-shlibs
 _USER_VARS.check-shlibs=	CHECK_SHLIBS
 _PKG_VARS.check-shlibs=		CHECK_SHLIBS_SUPPORTED
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_SHLIBS?=			yes
 .endif
 CHECK_SHLIBS?=			no
diff --git a/mk/check/check-stripped.mk b/mk/check/check-stripped.mk
index 4389c2e9e17..f84c9916913 100644
--- a/mk/check/check-stripped.mk
+++ b/mk/check/check-stripped.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-stripped.mk,v 1.3 2008/12/15 12:28:49 rillig Exp $
+# $NetBSD: check-stripped.mk,v 1.4 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks that after installation, all binaries conform to the
 # setting of INSTALL_UNSTRIPPED.
@@ -20,7 +20,7 @@
 #	Example: bin/* sbin/foo
 #
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_STRIPPED?=		no	# XXX: change to "yes" later
 .else
 CHECK_STRIPPED?=		no
diff --git a/mk/check/check-wrkref.mk b/mk/check/check-wrkref.mk
index 2e54b298925..5e72cc55369 100644
--- a/mk/check/check-wrkref.mk
+++ b/mk/check/check-wrkref.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.20 2009/09/02 14:43:06 joerg Exp $
+# $NetBSD: check-wrkref.mk,v 1.21 2010/08/24 19:08:29 bad Exp $
 #
 # This file checks that the installed files don't contain any strings
 # that point to the directory where the package had been built, to make
@@ -40,7 +40,7 @@ _VARGROUPS+=			check-wrkref
 _USER_VARS.check-wrkref=	CHECK_WRKREF
 _PKG_VARS.check-wrkref=		CHECK_WRKREF_SKIP
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 CHECK_WRKREF?=		tools home
 .endif
 CHECK_WRKREF?=		no
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 3f0e333d26d..e99d1d9f3b5 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.192 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: mk.conf,v 1.193 2010/08/24 19:08:29 bad Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -133,11 +133,11 @@ PKGSRC_SLEEPSECS?= 5
 
 #PKG_DEVELOPER=	yes
 #
-# Enables some sanity checks to raise the quality of the installed
-# packages. See the files pkgsrc/mk/check/check-*.mk for details and
-# further configuration options.
+# If defined and no "no" it enables some sanity checks to raise the quality
+# of the installed packages. See the files pkgsrc/mk/check/check-*.mk for
+# details and further configuration options.
 #
-# Possible: defined, not defined
+# Possible: defined, not defined, no
 # Default: not defined
 
 USE_ABI_DEPENDS?=	yes
@@ -174,14 +174,14 @@ PKGSRC_SHOW_BUILD_DEFS?=yes
 # Possible: "yes", not "yes"
 # Default: "yes"
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 PKGSRC_SHOW_PATCH_ERRORMSG?=no
 .else
 PKGSRC_SHOW_PATCH_ERRORMSG?=yes
 .endif
 # Print a potentially helpful error message when the "patch" stage fails
 # Possible: "yes", not "yes"
-# Default: "no" if PKG_DEVELOPER is defined, "yes" otherwise
+# Default: "no" if PKG_DEVELOPER is enabled, "yes" otherwise
 
 PKGSRC_RUN_TEST?=	no
 #
@@ -483,7 +483,7 @@ EXTRACT_USING?= nbtar
 # Possible: Regexps as in awk(1)
 # Default: none
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 MASTER_SORT_RANDOM?=	NO
 .else
 MASTER_SORT_RANDOM?=	YES
@@ -491,7 +491,7 @@ MASTER_SORT_RANDOM?=	YES
 # If set to YES or yes, a list of master sites will be randomly intermixed.
 # Also, both MASTER_SORT and MASTER_SORT_REGEX may be applied later.
 # Possible: yes, no / not defined
-# Default: NO if PKG_DEVELOPER is defined, YES otherwise
+# Default: NO if PKG_DEVELOPER is enabled, YES otherwise
 
 #PATCH_DEBUG=
 # Used to debug patches as they are applied
diff --git a/mk/license.mk b/mk/license.mk
index 1bc6bde1a58..592628c4aaa 100644
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.34 2010/05/06 13:16:59 obache Exp $
+# $NetBSD: license.mk,v 1.35 2010/08/24 19:08:29 bad Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -125,7 +125,7 @@ ACCEPTABLE_LICENSES=	${ACCEPTABLE_LICENCES}
 .endif
 
 .if !defined(LICENSE)
-.  if defined(PKG_DEVELOPER)
+.  if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 WARNINGS+=		"[license.mk] Every package should define a LICENSE."
 .  endif
 
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index da501ad3ab1..96482c5efe7 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.51 2010/07/08 04:57:36 dholland Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.52 2010/08/24 19:08:29 bad Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -986,7 +986,7 @@ FILES_SUBST+=		PKG_RCD_SCRIPTS=${PKG_RCD_SCRIPTS:Q}
 FILES_SUBST+=		PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS:Q}
 FILES_SUBST+=		PKG_UPDATE_FONTS_DB=${PKG_UPDATE_FONTS_DB:Q}
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 PKGINSTALL_VERBOSE?=	all
 .else
 PKGINSTALL_VERBOSE?=	# empty
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk
index b47ea6b187f..d5eea26c0ca 100644
--- a/mk/tools/pkg-config.mk
+++ b/mk/tools/pkg-config.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-config.mk,v 1.9 2008/04/20 19:32:31 jmmv Exp $
+# $NetBSD: pkg-config.mk,v 1.10 2010/08/24 19:08:29 bad Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,7 +54,7 @@ MAKE_ENV+=	PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q}
 MAKE_ENV+=	PKG_CONFIG_LOG=${_PKG_CONFIG_LOG:Q}
 MAKE_ENV+=	PKG_CONFIG_PATH=
 
-.if defined(PKG_DEVELOPER)
+.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
 post-build: pkgconfig-post-build
 
 pkgconfig-post-build: