Update to 0.22.0

  Improvements in cross-compilation. The following variables were
     introduced: TOOLDIR, SYSROOT, TOOLCHAIN_PREFIX and
     MACHINE_GNU_PLATFORM.

  PROGS variable was introduced (sf.net bug #3445658).

  Support for Lua submodules was added (e.g. net.socket.lua ->
  net/socket.lua). New variable LUA_MODULES was introduced for this
  purpose.

  MKPIE (Position Independent Executables), USE_SSP (Stack Smashing
  Protection), USE_FORT and USE_RELRO variables were introduced for
  security reasons.

  Variable OBJDIR_<dir> was introduced.

  mkc.subdir.mk and mkc.subprj.mk: Commands associated with targets
  "all", "install", "clean", "cleandir", "depend", "test",
  "installdirs", "uninstall", "errorcheck" and "filelist" in Makefile
  override the standard behaviour.

  MKC_REQUIRE_HEADERS, MKC_REQUIRE_DEFINES, MKC_REQUIRE_TYPES,
  MKC_REQUIRE_VARS, MKC_REQUIRE_MEMBERS, MKC_REQUIRE_FUNCS<n> and
  MKC_REQUIRE_CUSTOM do not change CFLAGS.

  mkc.subdir.mk and mkc.subprj.mk: "cleandir" target takes into
  account CLEANFILES, CLEANDIRS, DISTCLEANFILES and DISTCLEANDIRS
  variables (removes files).

  PCNAME.<lib> variable was introduced in mkc_imp.pkg-config.mk, this
  is a map from library name to pcname (.pc).

  Improvements for SHRTOUT.

  New variable OBJCOPY was introduced.

  Update of the presentation.

  Fix in manual page (sf.net bug #3441610).

  New regression tests (examples).

5 files changed, 47 insertions, 11 deletions

diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index 4686b24d15a..44a3583caac 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/10/21 23:30:31 cheusov Exp $
+# $NetBSD: Makefile,v 1.7 2012/03/09 18:56:21 cheusov Exp $
 #
 
-DISTNAME=	mk-configure-0.21.2
+DISTNAME=	mk-configure-0.22.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mk-configure/} \
 		http://mova.org/~cheusov/pub/mk-configure/
@@ -9,7 +9,9 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mk-configure/} \
 MAINTAINER=	cheusov@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/mk-configure
 COMMENT=	Lightweight but powerful replacement for GNU autotools
-LICENSE=		modified-bsd
+LICENSE=	modified-bsd
+
+DEPENDS+=	bmake-[0-9]*:../../devel/bmake
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,7 +20,7 @@ USE_LANGUAGES=		# no languages
 DOC_FILES=		README NEWS ChangeLog TODO FAQ COPYRIGHT \
 			doc/presentation.pdf
 
-MAKE_ENV+=		MANDIR=${PREFIX}/${PKGMANDIR} BMAKE=${MAKE}
+MAKE_ENV+=		MANDIR=${PREFIX}/${PKGMANDIR} BMAKE=${PREFIX}/bin/bmake
 
 AUTO_MKDIRS=		yes
 
diff --git a/devel/mk-configure/PLIST b/devel/mk-configure/PLIST
index 25188b733c1..ae9c8a186a7 100644
--- a/devel/mk-configure/PLIST
+++ b/devel/mk-configure/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/20 21:36:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/09 18:56:22 cheusov Exp $
 bin/mkc_check_common.sh
 bin/mkc_check_compiler
 bin/mkc_check_custom
@@ -28,6 +28,7 @@ share/doc/mk-configure/README
 share/doc/mk-configure/TODO
 share/doc/mk-configure/presentation.pdf
 share/examples/mk-configure/Makefile
+share/examples/mk-configure/Makefile.inc
 share/examples/mk-configure/hello_calc2/Makefile
 share/examples/mk-configure/hello_calc2/expect.out
 share/examples/mk-configure/hello_calc2/expressions.txt
@@ -70,6 +71,7 @@ share/examples/mk-configure/hello_cxxlib/cxxlib/linkme.mk
 share/examples/mk-configure/hello_cxxlib/expect.out
 share/examples/mk-configure/hello_cxxlib/test.mk
 share/examples/mk-configure/hello_dictd/Makefile
+share/examples/mk-configure/hello_dictd/Makefile.inc
 share/examples/mk-configure/hello_dictd/dict/Makefile
 share/examples/mk-configure/hello_dictd/dict/dict.1
 share/examples/mk-configure/hello_dictd/dict/dict.c
@@ -132,6 +134,12 @@ share/examples/mk-configure/hello_lua2/expect.out
 share/examples/mk-configure/hello_lua2/foo.lua
 share/examples/mk-configure/hello_lua2/foobar
 share/examples/mk-configure/hello_lua2/test.mk
+share/examples/mk-configure/hello_lua3/Makefile
+share/examples/mk-configure/hello_lua3/expect.out
+share/examples/mk-configure/hello_lua3/socket_bar.lua
+share/examples/mk-configure/hello_lua3/socket_baz.c
+share/examples/mk-configure/hello_lua3/socket_foo.lua
+share/examples/mk-configure/hello_lua3/test.mk
 share/examples/mk-configure/hello_plugins/Makefile
 share/examples/mk-configure/hello_plugins/app/Makefile
 share/examples/mk-configure/hello_plugins/app/app.c
@@ -150,6 +158,19 @@ share/examples/mk-configure/hello_plugins2/plugin1/plugin1.c
 share/examples/mk-configure/hello_plugins2/plugin2/Makefile
 share/examples/mk-configure/hello_plugins2/plugin2/plugin2.c
 share/examples/mk-configure/hello_plugins2/test.mk
+share/examples/mk-configure/hello_progs/Makefile
+share/examples/mk-configure/hello_progs/client.c
+share/examples/mk-configure/hello_progs/client_puts.c
+share/examples/mk-configure/hello_progs/expect.out
+share/examples/mk-configure/hello_progs/server.c
+share/examples/mk-configure/hello_progs/server_puts.c
+share/examples/mk-configure/hello_progs/test.mk
+share/examples/mk-configure/hello_progs2/Makefile
+share/examples/mk-configure/hello_progs2/client.c
+share/examples/mk-configure/hello_progs2/common.c
+share/examples/mk-configure/hello_progs2/expect.out
+share/examples/mk-configure/hello_progs2/server.c
+share/examples/mk-configure/hello_progs2/test.mk
 share/examples/mk-configure/hello_reqd/Makefile
 share/examples/mk-configure/hello_reqd/expect.out
 share/examples/mk-configure/hello_reqd/hello
@@ -184,6 +205,7 @@ share/examples/mk-configure/hello_strlcpy/input.in
 share/examples/mk-configure/hello_strlcpy/strlcpy.c
 share/examples/mk-configure/hello_strlcpy/test.mk
 share/examples/mk-configure/hello_subdirs/Makefile
+share/examples/mk-configure/hello_subdirs/Makefile.inc
 share/examples/mk-configure/hello_subdirs/prog1/Makefile
 share/examples/mk-configure/hello_subdirs/prog1/expect.out
 share/examples/mk-configure/hello_subdirs/prog1/prog1.awk
@@ -224,7 +246,6 @@ share/examples/mk-configure/hello_yacc/test.mk
 share/examples/mk-configure/subprojects/Makefile
 share/examples/mk-configure/subprojects/expect.out
 share/examples/mk-configure/subprojects/hello/Makefile
-share/examples/mk-configure/subprojects/hello/expect.out
 share/examples/mk-configure/subprojects/hello/hello_subprojects.1.in
 share/examples/mk-configure/subprojects/hello/hello_subprojects.c
 share/examples/mk-configure/subprojects/hello/hello_subprojects2.in
@@ -270,6 +291,7 @@ share/mkc-mk/mkc_imp.lib.mk
 share/mkc-mk/mkc_imp.links.mk
 share/mkc-mk/mkc_imp.lua.mk
 share/mkc-mk/mkc_imp.man.mk
+share/mkc-mk/mkc_imp.objdir.mk
 share/mkc-mk/mkc_imp.own.mk
 share/mkc-mk/mkc_imp.pkg-config.mk
 share/mkc-mk/mkc_imp.platform.sys.mk
diff --git a/devel/mk-configure/configure.mk b/devel/mk-configure/configure.mk
index 18caa973db0..fd1e1f1e5c0 100644
--- a/devel/mk-configure/configure.mk
+++ b/devel/mk-configure/configure.mk
@@ -1,4 +1,6 @@
-MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR} INSTALL=${INSTALL}
+# $NetBSD: configure.mk,v 1.4 2012/03/09 18:56:22 cheusov Exp $
+
+MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR} INSTALL=${INSTALL:Q}
 
 do-configure:
 	set -e; cd ${WRKSRC}; \
diff --git a/devel/mk-configure/distinfo b/devel/mk-configure/distinfo
index 820da24db61..607f41ef0df 100644
--- a/devel/mk-configure/distinfo
+++ b/devel/mk-configure/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/10/21 23:30:31 cheusov Exp $
+$NetBSD: distinfo,v 1.6 2012/03/09 18:56:22 cheusov Exp $
 
-SHA1 (mk-configure-0.21.2.tar.gz) = beb1f1f375e453279a891cf466bc900ce1ef4600
-RMD160 (mk-configure-0.21.2.tar.gz) = 5767e1da4eaa7b310316d6732b472311ab584c52
-Size (mk-configure-0.21.2.tar.gz) = 256732 bytes
+SHA1 (mk-configure-0.22.0.tar.gz) = 7bcb8768b22a6bac62ee970b31ef2e8f53b752e1
+RMD160 (mk-configure-0.22.0.tar.gz) = a61db4474b1d3e52439ae4daf974863800f445b0
+Size (mk-configure-0.22.0.tar.gz) = 262646 bytes
diff --git a/devel/mk-configure/mk-c.mk b/devel/mk-configure/mk-c.mk
new file mode 100644
index 00000000000..f2a1319ac73
--- /dev/null
+++ b/devel/mk-configure/mk-c.mk
@@ -0,0 +1,10 @@
+# $NetBSD: mk-c.mk,v 1.1 2012/03/09 18:56:22 cheusov Exp $
+
+MAKE_PROGRAM=	mkcmake
+MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR} INSTALL=${INSTALL:Q}
+
+do-configure:
+	set -e; cd ${WRKSRC}; \
+	env ${MAKE_ENV} \
+	    ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
+		-f ${MAKE_FILE} errorcheck