Simplify PKG_DEVELOPER checks.

14 files changed, 34 insertions, 31 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 93bdeb80ddc..e760d4d7574 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.2003 2014/10/09 13:44:51 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.2004 2014/10/12 23:39:17 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -802,7 +802,7 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
 .  endif
 .endif
 
-.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 .  include "misc/developer.mk"
 .endif
 .include "misc/show.mk"
diff --git a/mk/check/check-fakehome.mk b/mk/check/check-fakehome.mk
index 6425ae17a84..f795d1b1403 100644
--- a/mk/check/check-fakehome.mk
+++ b/mk/check/check-fakehome.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-fakehome.mk,v 1.3 2010/08/24 19:08:29 bad Exp $
+# $NetBSD: check-fakehome.mk,v 1.4 2014/10/12 23:39:17 joerg 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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_FAKEHOME?=		yes
 .else
 CHECK_FAKEHOME?=		no
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk
index 0b9a477448d..102074ca9a7 100644
--- a/mk/check/check-files.mk
+++ b/mk/check/check-files.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.30 2014/02/20 09:15:15 obache Exp $
+# $NetBSD: check-files.mk,v 1.31 2014/10/12 23:39:17 joerg 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,10 +29,11 @@ _VARGROUPS+=		check-files
 _USER_VARS.check-files=	CHECK_FILES CHECK_FILES_STRICT
 _PKG_VARS.check-files=	CHECK_FILES_SKIP
 
-.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_FILES?=		yes
-.endif
+.else
 CHECK_FILES?=		no
+.endif
 CHECK_FILES_STRICT?=	no
 
 # Info index files updated when a new info file is added.
diff --git a/mk/check/check-headers.mk b/mk/check/check-headers.mk
index 80638dda033..3089caf4d35 100644
--- a/mk/check/check-headers.mk
+++ b/mk/check/check-headers.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-headers.mk,v 1.6 2010/08/24 19:08:29 bad Exp $
+# $NetBSD: check-headers.mk,v 1.7 2014/10/12 23:39:17 joerg 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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 # still experimental
 #CHECK_HEADERS?=		yes
 .endif
diff --git a/mk/check/check-interpreter.mk b/mk/check/check-interpreter.mk
index b026e6a5ea9..cbb8a73bedc 100644
--- a/mk/check/check-interpreter.mk
+++ b/mk/check/check-interpreter.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-interpreter.mk,v 1.27 2011/04/19 15:31:45 roy Exp $
+# $NetBSD: check-interpreter.mk,v 1.28 2014/10/12 23:39:17 joerg Exp $
 #
 # This file checks that after installation, all files of the package
 # that start with a "#!" line will find their interpreter. Files that
@@ -27,7 +27,7 @@
 #	Example: share/package1/* share/package2/somefile
 #
 
-.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_INTERPRETER?=		yes
 .else
 CHECK_INTERPRETER?=		no
diff --git a/mk/check/check-perms.mk b/mk/check/check-perms.mk
index 01fbd7b64fa..9e6f5a82493 100644
--- a/mk/check/check-perms.mk
+++ b/mk/check/check-perms.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-perms.mk,v 1.15 2014/05/09 11:59:27 richard Exp $
+# $NetBSD: check-perms.mk,v 1.16 2014/10/12 23:39:17 joerg 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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_PERMS?=		yes
 .else
 CHECK_PERMS?=		no
diff --git a/mk/check/check-portability.mk b/mk/check/check-portability.mk
index 3eba80c0a1d..1976ac0daae 100644
--- a/mk/check/check-portability.mk
+++ b/mk/check/check-portability.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.mk,v 1.7 2010/08/24 19:08:29 bad Exp $
+# $NetBSD: check-portability.mk,v 1.8 2014/10/12 23:39:17 joerg 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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_PORTABILITY?=		yes
 .endif
 CHECK_PORTABILITY?=		no
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk
index a440494b91c..1eb2c8b57d4 100644
--- a/mk/check/check-shlibs.mk
+++ b/mk/check/check-shlibs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.23 2014/03/02 05:43:16 obache Exp $
+# $NetBSD: check-shlibs.mk,v 1.24 2014/10/12 23:39:17 joerg Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -29,10 +29,11 @@ _VARGROUPS+=			check-shlibs
 _USER_VARS.check-shlibs=	CHECK_SHLIBS
 _PKG_VARS.check-shlibs=		CHECK_SHLIBS_SUPPORTED
 
-.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_SHLIBS?=			yes
-.endif
+.else
 CHECK_SHLIBS?=			no
+.endif
 CHECK_SHLIBS_SUPPORTED?=	yes
 CHECK_SHLIBS_SKIP?=		# none
 
diff --git a/mk/check/check-stripped.mk b/mk/check/check-stripped.mk
index 60d64685e33..bf2a11418eb 100644
--- a/mk/check/check-stripped.mk
+++ b/mk/check/check-stripped.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-stripped.mk,v 1.5 2013/05/12 06:17:50 obache Exp $
+# $NetBSD: check-stripped.mk,v 1.6 2014/10/12 23:39:17 joerg 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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "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 cd177ee70af..1a2ac0d9e54 100644
--- a/mk/check/check-wrkref.mk
+++ b/mk/check/check-wrkref.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.22 2014/09/04 16:09:33 jperkin Exp $
+# $NetBSD: check-wrkref.mk,v 1.23 2014/10/12 23:39:17 joerg 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
@@ -41,10 +41,11 @@ _VARGROUPS+=			check-wrkref
 _USER_VARS.check-wrkref=	CHECK_WRKREF
 _PKG_VARS.check-wrkref=		CHECK_WRKREF_SKIP
 
-.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_WRKREF?=		tools home
-.endif
+.else
 CHECK_WRKREF?=		no
+.endif
 CHECK_WRKREF_SKIP?=	# none
 
 _CHECK_WRKREF_FILELIST_CMD?=	${PKG_FILELIST_CMD}
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 9c9e5e5910a..182cfb37221 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.244 2014/07/30 08:39:49 wiz Exp $
+# $NetBSD: mk.conf,v 1.245 2014/10/12 23:39:17 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -86,7 +86,7 @@ GZIP?=	-9
 # Possible: pathname to the X509 certificate, not defined
 # Default: not defined
 
-.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 PATCH_DEBUG?=
 .endif
 # Used to debug patches as they are applied
diff --git a/mk/license.mk b/mk/license.mk
index bb216e9a3ba..a9f9f2b8897 100644
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.63 2014/05/15 09:59:09 wiz Exp $
+# $NetBSD: license.mk,v 1.64 2014/10/12 23:39:17 joerg Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -152,7 +152,7 @@ ACCEPTABLE_LICENSES=	${ACCEPTABLE_LICENCES}
 .endif
 
 .if !defined(LICENSE)
-.  if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
+.  if ${PKG_DEVELOPER:Uno} != "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 6ff801f8e56..838c56330a2 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.58 2014/03/11 13:45:07 jperkin Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.59 2014/10/12 23:39:17 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -1005,7 +1005,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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 PKGINSTALL_VERBOSE?=	all
 .else
 PKGINSTALL_VERBOSE?=	# empty
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk
index 9d0709b6b82..3d67c7676fd 100644
--- a/mk/tools/pkg-config.mk
+++ b/mk/tools/pkg-config.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-config.mk,v 1.12 2014/03/07 15:15:17 jperkin Exp $
+# $NetBSD: pkg-config.mk,v 1.13 2014/10/12 23:39:17 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -57,7 +57,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) && ${PKG_DEVELOPER} != "no"
+.if ${PKG_DEVELOPER:Uno} != "no"
 post-build: pkgconfig-post-build
 
 pkgconfig-post-build: