Import bmake-20100423:

- Fixes for vfork(), bogus $TMPDIR, .export and realpath(3)
- boot-strap fixes to allow -m .../mk, no default use of /usr/share/mk
  on !NetBSD, honor --with-default-sys-path
- Other small improvements

3 files changed, 20 insertions, 6 deletions

diff --git a/devel/bmake/files/realpath.c b/devel/bmake/files/realpath.c
index 9783fefb260..a8dc83bd914 100644
--- a/devel/bmake/files/realpath.c
+++ b/devel/bmake/files/realpath.c
@@ -1,5 +1,5 @@
-/* $Id: realpath.c,v 1.1.1.1 2010/04/20 13:32:27 joerg Exp $ */
-/* from: $NetBSD: realpath.c,v 1.1.1.1 2010/04/20 13:32:27 joerg Exp $	*/
+/* $Id: realpath.c,v 1.1.1.2 2010/04/24 20:33:57 joerg Exp $ */
+/* from: $NetBSD: realpath.c,v 1.1.1.2 2010/04/24 20:33:57 joerg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -35,7 +35,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifndef HAVE_REALPATHx
+#ifndef HAVE_REALPATH
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/devel/bmake/files/unit-tests/export-all b/devel/bmake/files/unit-tests/export-all
index 9108dd4c33b..85224a532c0 100644
--- a/devel/bmake/files/unit-tests/export-all
+++ b/devel/bmake/files/unit-tests/export-all
@@ -1,8 +1,20 @@
-# $Id: export-all,v 1.1.1.3 2009/09/18 20:55:34 joerg Exp $
+# $Id: export-all,v 1.1.1.4 2010/04/24 20:34:05 joerg Exp $
 
 UT_OK=good
 UT_F=fine
 
+# the old way to do :tA
+M_tAbad = C,.*,cd & \&\& 'pwd',:sh
+# the new
+M_tA = tA
+
+here := ${.PARSEDIR}
+
+# this will cause trouble (recursing if we let it)
+UT_BADDIR = ${${here}/../${here:T}:L:${M_tAbad}:T}
+# this will be ok
+UT_OKDIR = ${${here}/../${here:T}:L:${M_tA}:T}
+
 .export
 
 .include "export"
diff --git a/devel/bmake/files/unit-tests/modmisc b/devel/bmake/files/unit-tests/modmisc
index 19b8f6005f9..375accca28d 100644
--- a/devel/bmake/files/unit-tests/modmisc
+++ b/devel/bmake/files/unit-tests/modmisc
@@ -1,8 +1,10 @@
-# $Id: modmisc,v 1.1.1.3 2009/09/18 20:55:34 joerg Exp $
+# $Id: modmisc,v 1.1.1.4 2010/04/24 20:34:05 joerg Exp $
 #
 # miscellaneous modifier tests
 
-path=:/bin:/usr/bin::/sbin:/usr/sbin:.:/home/user/bin:.
+# do not put any dirs in this list which exist on some
+# but not all target systems - an exists() check is below.
+path=:/bin:/tmp::/:.:/no/such/dir:.
 # strip cwd from path.
 MOD_NODOT=S/:/ /g:N.:ts:
 # and decorate, note that $'s need to be doubled. Also note that