summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/check/check-perms.mk6
-rw-r--r--mk/defaults/mk.conf10
-rw-r--r--mk/platform/Interix.mk9
3 files changed, 22 insertions, 3 deletions
diff --git a/mk/check/check-perms.mk b/mk/check/check-perms.mk
index bf857ed0ec5..d70c517d808 100644
--- a/mk/check/check-perms.mk
+++ b/mk/check/check-perms.mk
@@ -1,8 +1,12 @@
-# $NetBSD: check-perms.mk,v 1.17 2014/11/21 10:46:36 obache Exp $
+# $NetBSD: check-perms.mk,v 1.18 2015/02/01 11:42:59 obache Exp $
#
# This file checks that after installation of a package, all files and
# directories of that package have sensible permissions set.
#
+# To use this check in bulk builds, add
+# BULK_PREREQ+= sysutils/checkperms
+# to your mk.conf file.
+#
# User-settable variables:
#
# CHECK_PERMS
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 166dd741d49..11b216962da 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.252 2014/12/30 15:13:19 wiz Exp $
+# $NetBSD: mk.conf,v 1.253 2015/02/01 11:42:59 obache Exp $
#
# This file provides default values for variables that may be overridden
@@ -699,6 +699,14 @@ BIND_USER?= named
# Possible: any user name
# Default: named
+#BULK_PREREQ=
+# Used during bulk package builds. Packages listed in this variable are
+# assumed to be required to build all packages. Only a very limited number
+# of packages belong in this variable.
+# Currently pkgtools/digest is always added to this list.
+# Possible: category/pkg
+# Default: not defined
+
CACTI_GROUP?= cacti
# System group to run the cacti collection cron jobs as. Used by the
# "cacti" package.
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index e6b62c98997..610b32e96d8 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.74 2014/11/21 10:46:36 obache Exp $
+# $NetBSD: Interix.mk,v 1.75 2015/02/01 11:42:59 obache Exp $
#
# Variable definitions for the Interix operating system.
@@ -55,6 +55,7 @@ MAKE_FLAGS+= MKCATPAGES=no NOLINT=1
###
# NetBSD's faster, vfork-capable shell (not yet in pkgsrc)
+#BULK_PREREQ+= shells/nbsh
.if exists(${PREFIX}/bin/nbsh)
TOOLS_SHELL?= ${PREFIX}/bin/nbsh
WRAPPER_SHELL?= ${PREFIX}/bin/nbsh
@@ -63,6 +64,12 @@ WRAPPER_SHELL?= ${PREFIX}/bin/nbsh
INSTALL?= ${PREFIX}/bin/install-sh
SED?= ${PREFIX}/bin/nbsed
+.if defined(BATCH)
+BULK_PREREQ+= lang/perl5
+USE_BULK_BROKEN_CHECK?= no
+USE_BULK_TIMESTAMPS?= no
+.endif
+
###
### Platform definitions common to pkgsrc/mk/platform/*.mk
###