	@@ -1,40 +1,48 @@		@@ -1,40 +1,48 @@
1	# $NetBSD: alternatives.mk,v 1.12 2015/11/25 13:05:47 jperkin Exp $	1	# $NetBSD: alternatives.mk,v 1.13 2018/05/16 21:23:02 rillig Exp $
2	#	2	#
3	# This Makefile fragment handles the alternatives system, registering a	3	# This Makefile fragment handles the alternatives system, registering a
4	# package in the database.	4	# package in the database.
5	#	5	#
6	# User-settable variables:	6	# User-settable variables:
7	#	7	#
8	# (none)	8	# (none)
9	#	9	#
10	# Package-settable variables:	10	# Package-settable variables:
11	#	11	#
12	# ALTERNATIVES_SRC	12	# ALTERNATIVES_SRC
13	# A _single_ file that contains the alternatives provided by the	13	# A _single_ file that contains the alternatives provided by the
14	# package.	14	# package.
15	#	15	#
16	# Default value: The name of the ALTERNATIVES file in the package	16	# Default value: The name of the ALTERNATIVES file in the package
17	# directory, if it exists. Otherwise, nothing.	17	# directory, if it exists. Otherwise, nothing.
18	#	18	#
19	# Each line of the alternatives file contains two filenames, first	19	# Each line of the alternatives file contains two filenames:
20	# the wrapper and then the alternative provided by the package.	20	#
		21	# wrapper alternative
		22	#
		23	# The wrapper is the command that is run by the user.
		24	# The alternative is the implementation of that command that is
		25	# provided by the package.
21	# Both paths are relative to PREFIX.	26	# Both paths are relative to PREFIX.
		27	# The paths may use placeholders of the form @VARNAME@, which are
		28	# replaced with the actual values as per FILES_SUBST.
22	#	29	#
23	# Variables defined by this file:	30	# Variables defined by this file:
24	#	31	#
25	# PKG_ALTERNATIVES	32	# PKG_ALTERNATIVES
26	# The path to the pkg_alternatives command.	33	# The path to the pkg_alternatives command.
27	#	34	#
		35	# Keywords: alternatives
28		36
29	.if !defined(ALTERNATIVES_MK)	37	.if !defined(ALTERNATIVES_MK)
30	ALTERNATIVES_MK= # defined	38	ALTERNATIVES_MK= # defined
31		39
32	_VARGROUPS+= alternatives	40	_VARGROUPS+= alternatives
33	_PKG_VARS.alternatives= ALTERNATIVES_SRC	41	_PKG_VARS.alternatives= ALTERNATIVES_SRC
34	_SYS_VARS.alternatives= PKG_ALTERNATIVES	42	_SYS_VARS.alternatives= PKG_ALTERNATIVES
35		43
36	.if exists(${.CURDIR}/ALTERNATIVES)	44	.if exists(${.CURDIR}/ALTERNATIVES)
37	ALTERNATIVES_SRC?= ${.CURDIR}/ALTERNATIVES	45	ALTERNATIVES_SRC?= ${.CURDIR}/ALTERNATIVES
38	.endif	46	.endif
39	ALTERNATIVES_SRC?= # none	47	ALTERNATIVES_SRC?= # none
40		48

 @@ -1,14 +1,14 @@
-# $NetBSD: build.mk,v 1.22 2017/06/01 02:15:10 jlam Exp $
+# $NetBSD: build.mk,v 1.23 2018/05/16 21:23:02 rillig Exp $
+#
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
+#
 # Public targets for developers:
+#
 # build-env:
 #	Runs an interactive shell (BUILD_ENV_SHELL) in the environment
 #	that is used for building the package.
+#
 # Package-settable variables:
+#
 # BUILD_MAKE_FLAGS is the list of arguments that is passed to the make
 @@ -170,22 +170,37 @@ do-build:
 .  endfor
 .endif
 .if !target(pre-build)
 pre-build:
 	@${DO_NADA}
 .endif
 .if !target(post-build)
 post-build:
 	@${DO_NADA}
 .endif
 # build-env:
 #	Starts an interactive shell in WRKSRC.
+#
 #	This is only used during development and testing of a package
 #	to work in the same environment as the actual build.
+#
 # User-settable variables:
+#
 # BUILD_ENV_SHELL
 #	The shell to start.
+#
 #	Default: ${SH}
+#
 # Keywords: debug build
 BUILD_ENV_SHELL?=	${SH}
 .if defined(_PKGSRC_BARRIER)
 build-env: .PHONY configure
 	@${STEP_MSG} "Entering the build environment for ${PKGNAME}"
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}
 .else
 build-env: barrier
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: bin-install.mk,v 1.26 2017/08/19 00:30:19 jlam Exp $
+# $NetBSD: bin-install.mk,v 1.27 2018/05/16 21:23:02 rillig Exp $
+#
 # This file provides the following targets:
+#
 # bin-install:
 #	Tries to install a package from a prebuilt binary package, and
 #	if that doesn't work, builds the package from source.
+#
 # === User-settable variables ===
+#
 # PACKAGES
 #	This directory is searched before BINPKG_SITES when trying to
 #	install binary packages.
 @@ -17,28 +17,29 @@
 #	A list of URLs where binary packages can be found.
 #	See mk/defaults/mk.conf for details.
+#
 # === Command line variables ===
+#
 # PKGNAME_REQD
 #	The package pattern that is required to be installed. By default,
 #	any version of this package will do, but when installing
 #	dependencies, a special version may be needed.
 # XXX: This file contains implementation details from the "pkg" format,
 # for example the All/ directory and the @cwd.
-# List of sites carrying binary pkgs. Variables "rel" and "arch" are
+# List of sites carrying binary packages. Shell Variables "rel" and
-# replaced with OS release ("1.5", ...) and architecture ("mipsel", ...)
+# "arch" are replaced with OS release ("1.5", ...) and architecture
 # ("mipsel", ...).
 .if ${OPSYS} == "NetBSD"
 BINPKG_SITES?= \
 	http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel} \
 	http://ftp6.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel}
 .elif ${OPSYS} == "Minix"
 BINPKG_SITES?= \
 	ftp://ftp.minix3.org/pub/minix/packages/$$(${UNAME} -r)/$${arch}
 .elif ${OPSYS} == "DragonFly"
 BINPKG_SITES?= \
 	http://mirror-master.dragonflybsd.org/packages/$${arch}/DragonFly-$${rel}/stable
 .else
 BINPKG_SITES?=
 .endif

 @@ -1,35 +1,36 @@
-# $NetBSD: can-be-built-here.mk,v 1.8 2015/01/01 06:06:06 dholland Exp $
+# $NetBSD: can-be-built-here.mk,v 1.9 2018/05/16 21:23:02 rillig Exp $
+#
 # This file checks whether a package can be built in the current pkgsrc
 # environment. It checks the following variables:
+#
 # * NOT_FOR_COMPILER, ONLY_FOR_COMPILER
 # * NOT_FOR_PLATFORM, ONLY_FOR_PLATFORM
 # * BROKEN_ON_PLATFORM, BROKEN_EXCEPT_ON_PLATFORM
 # * NOT_FOR_BULK_PLATFORM
 # * NOT_FOR_UNPRIVILEGED, ONLY_FOR_UNPRIVILEGED
 # * PKG_FAIL_REASON, PKG_SKIP_REASON
+#
 # It also depends on the following internal variables:
+#
 # NO_SKIP
 #	When defined, the checks in this file are skipped. It is called
 #	NO_SKIP because the code that skips building the package should
 #	_not_ be run.
+#
 #	XXX: It's weird to have three negations in such a short variable
 #	name.
+#
 # Keywords: compiler broken only platform
 _CBBH_CHECKS=		# none, but see below.
 # Check NOT_FOR_COMPILER
 _CBBH_CHECKS+=		ncomp
 _CBBH_MSGS.ncomp=	"This package is not available for these compilers: "${NOT_FOR_COMPILER:Q}"."
 _CBBH.ncomp=		yes
 .for c in ${NOT_FOR_COMPILER}
 .  for pc in ${PKGSRC_COMPILER}
 # The left-hand side of the == operator must be a "real" variable.
 _c:= ${c}
 .    if ${_c} == ${pc}