Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.

Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.

The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.

Approved by: re (gjb, implicit)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Fix Fx syntax.

PR: 182269
Approved by: re@

If MAKE_JOB_ERROR_TOKEN is set to false, do not put an error token ("E")
into the job queue.
This avoids closing down an entire build on failure of one branch.
Probably has no use outside the context of universe/tinderbox.

Reviewed by: obrien

Merge bmake-20130904

Pay attention to errCheck!

PR: 181715

Add .MAKE.ALWAYS_PASS_JOB_QUEUE knob (default yes)
for backwards compatability.

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

Move the call to Job_SetPrefix() to Job_Init() so that
makefiles have had a chance to set .MAKE.JOB.PREFIX

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

Update to bmake-20130604 to fix file descriptor leak.

Sync with upstream version (20130520) that includes same fixes made last week.

Fix wildcard srcs for phony targets

Match what is in netbsd.

Var_Delete: expand name to delete if needed.

We really need to get the bsd.own.mk from this tree so the
correct options are set.
Also defined NO_PWD_OVERRIDE to match behavior of fmake.

Local hack to allow smooth transition for ports.
bsd.port.mk can set .MAKE.FreeBSD_UL=yes
to cause :L and :U to have their old behavior.
This should be reverted when 8.3 is EOL.

PR: 173299
Reviewed by: obrien

Update to bmake-20130330

Merge bmake-20130123

Approved by: marcel (mentor)

Merge bmake-20121111
Also pay attention to MK_SHARED_TOOLCHAIN.

Approved by: marcel (mentor)

Merge bmake-20121010

Approved by: marcel (mentor)

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg

Import the 20120831 release of the "Portable" BSD make tool (from NetBSD).

Submitted by: Simon Gerraty <sjg@juniper.net>

Import the 20120704 release of the "Portable" BSD make tool (from NetBSD).

Submitted by: Simon Gerraty <sjg@juniper.net>

Import the 20-June-2012 release of the "Portable" BSD make tool (from NetBSD).

Submitted by: sjg@juniper.net

Import the 6-May-2012 release of the "Portable" BSD make tool (from NetBSD).

Submitted by: sjg@juniper.net