From ff39331baaa3cbbfade0d1885f08bb2d7cd2b62e Mon Sep 17 00:00:00 2001 From: bad Date: Tue, 24 Aug 2010 19:08:28 +0000 Subject: 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. --- mk/check/check-fakehome.mk | 4 ++-- mk/check/check-files.mk | 4 ++-- mk/check/check-headers.mk | 4 ++-- mk/check/check-interpreter.mk | 4 ++-- mk/check/check-perms.mk | 4 ++-- mk/check/check-portability.mk | 4 ++-- mk/check/check-shlibs.mk | 4 ++-- mk/check/check-stripped.mk | 4 ++-- mk/check/check-wrkref.mk | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'mk/check') 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 -- cgit v1.2.3