4 files changed, 87 insertions, 26 deletions

diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index 3d1ad0f5959..7abb651233a 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/07/13 15:52:36 cheusov Exp $
+# $NetBSD: Makefile,v 1.18 2014/09/14 13:11:39 cheusov Exp $
 #
 
-DISTNAME=	mk-configure-0.27.0
+DISTNAME=	mk-configure-0.28.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mk-configure/} \
 		http://mova.org/~cheusov/pub/mk-configure/
@@ -23,6 +23,7 @@ MAKE_PROGRAM=		${PREFIX}/bin/bmake
 MAKE_ENV+=		MANDIR=${PREFIX}/${PKGMANDIR} \
 			SYSCONFDIR=${PKG_SYSCONFDIR} \
 			BMAKE=${PREFIX}/bin/bmake
+MAKE_FLAGS=		PROG.awk=${AWK:Q}
 
 AUTO_MKDIRS=		yes
 
@@ -36,6 +37,8 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 
+CHECK_PERMS_SKIP=	*/foobar.in */hello_world3.in */prog1.awk.in
+
 .if ${OPSYS} == SunOS && exists(/usr/xpg4/bin/awk)
 REPLACE_INTERPRETER+=	awk
 REPLACE.awk.old=	/usr/bin/awk
diff --git a/devel/mk-configure/PLIST b/devel/mk-configure/PLIST
index 72112fa78be..38f98dac98e 100644
--- a/devel/mk-configure/PLIST
+++ b/devel/mk-configure/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/07/13 15:52:36 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/09/14 13:11:39 cheusov Exp $
 bin/mkc_check_common.sh
 bin/mkc_check_compiler
 bin/mkc_check_custom
@@ -8,7 +8,9 @@ bin/mkc_check_header
 bin/mkc_check_prog
 bin/mkc_check_sizeof
 bin/mkc_check_version
+bin/mkc_get_deps
 bin/mkc_install
+bin/mkc_long_lines
 bin/mkc_test_helper
 bin/mkc_which
 bin/mkcmake
@@ -23,6 +25,7 @@ man/man7/mk-configure.7
 share/doc/mk-configure/FAQ
 share/doc/mk-configure/LICENSE
 share/doc/mk-configure/NEWS
+share/doc/mk-configure/NOTES
 share/doc/mk-configure/README
 share/doc/mk-configure/TODO
 share/doc/mk-configure/presentation.pdf
@@ -47,12 +50,43 @@ share/examples/mk-configure/hello_TARGETS/hello2/Makefile
 share/examples/mk-configure/hello_TARGETS/hello2/hello2.c
 share/examples/mk-configure/hello_TARGETS/hello2/hello2.pod
 share/examples/mk-configure/hello_TARGETS/test.mk
+share/examples/mk-configure/hello_autoconf/Makefile
+share/examples/mk-configure/hello_autoconf/expect.out
+share/examples/mk-configure/hello_autoconf/proj/AUTHORS
+share/examples/mk-configure/hello_autoconf/proj/COPYING
+share/examples/mk-configure/hello_autoconf/proj/ChangeLog
+share/examples/mk-configure/hello_autoconf/proj/Makefile.in
+share/examples/mk-configure/hello_autoconf/proj/NEWS
+share/examples/mk-configure/hello_autoconf/proj/README
+share/examples/mk-configure/hello_autoconf/proj/configure.ac
+share/examples/mk-configure/hello_autoconf/proj/hello_autoconf.c
+share/examples/mk-configure/hello_autoconf/test.mk
+share/examples/mk-configure/hello_autotools/Makefile
+share/examples/mk-configure/hello_autotools/expect.out
+share/examples/mk-configure/hello_autotools/proj/AUTHORS
+share/examples/mk-configure/hello_autotools/proj/COPYING
+share/examples/mk-configure/hello_autotools/proj/ChangeLog
+share/examples/mk-configure/hello_autotools/proj/Makefile.am
+share/examples/mk-configure/hello_autotools/proj/NEWS
+share/examples/mk-configure/hello_autotools/proj/README
+share/examples/mk-configure/hello_autotools/proj/configure.ac
+share/examples/mk-configure/hello_autotools/proj/main.c
+share/examples/mk-configure/hello_autotools/test.mk
 share/examples/mk-configure/hello_calc2/Makefile
 share/examples/mk-configure/hello_calc2/expect.out
 share/examples/mk-configure/hello_calc2/expressions.txt
 share/examples/mk-configure/hello_calc2/lex.l
 share/examples/mk-configure/hello_calc2/parser.y
 share/examples/mk-configure/hello_calc2/test.mk
+share/examples/mk-configure/hello_compatlib/Makefile
+share/examples/mk-configure/hello_compatlib/Makefile.inc
+share/examples/mk-configure/hello_compatlib/expect.out
+share/examples/mk-configure/hello_compatlib/libcmpt/Makefile
+share/examples/mk-configure/hello_compatlib/prog1/Makefile
+share/examples/mk-configure/hello_compatlib/prog1/prog1.c
+share/examples/mk-configure/hello_compatlib/prog2/Makefile
+share/examples/mk-configure/hello_compatlib/prog2/prog2.c
+share/examples/mk-configure/hello_compatlib/test.mk
 share/examples/mk-configure/hello_compilers/Makefile
 share/examples/mk-configure/hello_compilers/compiler_test.c
 share/examples/mk-configure/hello_compilers/expect.out
@@ -84,6 +118,7 @@ share/examples/mk-configure/hello_cxxlib/Makefile
 share/examples/mk-configure/hello_cxxlib/cxxapp/Makefile
 share/examples/mk-configure/hello_cxxlib/cxxapp/cxxapp.cc
 share/examples/mk-configure/hello_cxxlib/cxxlib/Makefile
+share/examples/mk-configure/hello_cxxlib/cxxlib/dummy.c
 share/examples/mk-configure/hello_cxxlib/cxxlib/hello_msg1.cpp
 share/examples/mk-configure/hello_cxxlib/cxxlib/hello_msg2.cpp
 share/examples/mk-configure/hello_cxxlib/cxxlib/include/hello_msg.h
@@ -111,19 +146,24 @@ share/examples/mk-configure/hello_dictd/doc/doc.txt
 share/examples/mk-configure/hello_dictd/expect.out
 share/examples/mk-configure/hello_dictd/libcommon/Makefile
 share/examples/mk-configure/hello_dictd/libcommon/iswalnum.c
-share/examples/mk-configure/hello_dictd/libcommon/linkme.mk
 share/examples/mk-configure/hello_dictd/libcommon/str.c
 share/examples/mk-configure/hello_dictd/libdz/Makefile
 share/examples/mk-configure/hello_dictd/libdz/dz.c
 share/examples/mk-configure/hello_dictd/libdz/export.sym
-share/examples/mk-configure/hello_dictd/libdz/linkme.mk
 share/examples/mk-configure/hello_dictd/libmaa/Makefile
 share/examples/mk-configure/hello_dictd/libmaa/export.sym
-share/examples/mk-configure/hello_dictd/libmaa/linkme.mk
 share/examples/mk-configure/hello_dictd/libmaa/log.c
 share/examples/mk-configure/hello_dictd/libmaa/prime.c
 share/examples/mk-configure/hello_dictd/libmaa/set.c
 share/examples/mk-configure/hello_dictd/test.mk
+share/examples/mk-configure/hello_errwarn/Makefile
+share/examples/mk-configure/hello_errwarn/expect.out
+share/examples/mk-configure/hello_errwarn/hello.c
+share/examples/mk-configure/hello_errwarn/test.mk
+share/examples/mk-configure/hello_fgetln/Makefile
+share/examples/mk-configure/hello_fgetln/expect.out
+share/examples/mk-configure/hello_fgetln/hello.c
+share/examples/mk-configure/hello_fgetln/test.mk
 share/examples/mk-configure/hello_files/DEBIAN/control
 share/examples/mk-configure/hello_files/Makefile
 share/examples/mk-configure/hello_files/expect.NetBSD.out
@@ -147,6 +187,27 @@ share/examples/mk-configure/hello_lex/expect.out
 share/examples/mk-configure/hello_lex/hello_lex.l
 share/examples/mk-configure/hello_lex/input.txt
 share/examples/mk-configure/hello_lex/test.mk
+share/examples/mk-configure/hello_libdeps/Makefile
+share/examples/mk-configure/hello_libdeps/expect.out
+share/examples/mk-configure/hello_libdeps/libs/libbar/Makefile
+share/examples/mk-configure/hello_libdeps/libs/libbar/bar.c
+share/examples/mk-configure/hello_libdeps/libs/libbar/bar.h
+share/examples/mk-configure/hello_libdeps/libs/libbaz/Makefile
+share/examples/mk-configure/hello_libdeps/libs/libbaz/baz.c
+share/examples/mk-configure/hello_libdeps/libs/libbaz/include/baz.h
+share/examples/mk-configure/hello_libdeps/libs/libbaz/linkme.mk
+share/examples/mk-configure/hello_libdeps/libs/libfoo/Makefile
+share/examples/mk-configure/hello_libdeps/libs/libfoo/foo.c
+share/examples/mk-configure/hello_libdeps/libs/libfoo/foo.h
+share/examples/mk-configure/hello_libdeps/libs/libfoo/linkme.mk
+share/examples/mk-configure/hello_libdeps/libs/libfooqux/Makefile
+share/examples/mk-configure/hello_libdeps/libs/libfooqux/fooqux.c
+share/examples/mk-configure/hello_libdeps/libs/libfooqux/fooqux.h
+share/examples/mk-configure/hello_libdeps/progs/foobaz/Makefile
+share/examples/mk-configure/hello_libdeps/progs/foobaz/foobaz.c
+share/examples/mk-configure/hello_libdeps/progs/fooquxfoobar/Makefile
+share/examples/mk-configure/hello_libdeps/progs/fooquxfoobar/fooquxfoobar.c
+share/examples/mk-configure/hello_libdeps/test.mk
 share/examples/mk-configure/hello_lua/Makefile
 share/examples/mk-configure/hello_lua/bar.lua
 share/examples/mk-configure/hello_lua/baz.c
@@ -209,7 +270,7 @@ share/examples/mk-configure/hello_scripts/Makefile
 share/examples/mk-configure/hello_scripts/expect.out
 share/examples/mk-configure/hello_scripts/hello_world.1
 share/examples/mk-configure/hello_scripts/hello_world2
-share/examples/mk-configure/hello_scripts/hello_world3
+share/examples/mk-configure/hello_scripts/hello_world3.in
 share/examples/mk-configure/hello_scripts/main.c
 share/examples/mk-configure/hello_scripts/more_scripts/script1
 share/examples/mk-configure/hello_scripts/more_scripts/script2
@@ -242,7 +303,7 @@ share/examples/mk-configure/hello_strlcpy3/test.mk
 share/examples/mk-configure/hello_subdirs/Makefile
 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
+share/examples/mk-configure/hello_subdirs/prog1/prog1.awk.in
 share/examples/mk-configure/hello_subdirs/prog1/prog1.c
 share/examples/mk-configure/hello_subdirs/prog1/prog1.sh
 share/examples/mk-configure/hello_subdirs/prog1/test.mk
@@ -308,13 +369,10 @@ share/examples/mk-configure/tools/expect.out
 share/examples/mk-configure/tools/libs/bar/Makefile
 share/examples/mk-configure/tools/libs/bar/bar.c
 share/examples/mk-configure/tools/libs/bar/bar.h
-share/examples/mk-configure/tools/libs/bar/linkme.mk
 share/examples/mk-configure/tools/libs/foo/Makefile
 share/examples/mk-configure/tools/libs/foo/foo.c
 share/examples/mk-configure/tools/libs/foo/foo.h
-share/examples/mk-configure/tools/libs/foo/linkme.mk
 share/examples/mk-configure/tools/libs/qux/Makefile
-share/examples/mk-configure/tools/libs/qux/linkme.mk
 share/examples/mk-configure/tools/libs/qux/qux.c
 share/examples/mk-configure/tools/libs/qux/qux.h.in
 share/examples/mk-configure/tools/test.mk
@@ -331,13 +389,10 @@ share/examples/mk-configure/tools2/expect.out
 share/examples/mk-configure/tools2/libs/bar/Makefile
 share/examples/mk-configure/tools2/libs/bar/bar.c
 share/examples/mk-configure/tools2/libs/bar/bar.h
-share/examples/mk-configure/tools2/libs/bar/linkme.mk
 share/examples/mk-configure/tools2/libs/foo/Makefile
 share/examples/mk-configure/tools2/libs/foo/foo.c
 share/examples/mk-configure/tools2/libs/foo/foo.h
-share/examples/mk-configure/tools2/libs/foo/linkme.mk
 share/examples/mk-configure/tools2/libs/qux/Makefile
-share/examples/mk-configure/tools2/libs/qux/linkme.mk
 share/examples/mk-configure/tools2/libs/qux/qux.c
 share/examples/mk-configure/tools2/libs/qux/qux.h.in
 share/examples/mk-configure/tools2/test.mk
@@ -353,11 +408,12 @@ share/examples/mk-configure/tools2/tools/prog3/Makefile
 share/examples/mk-configure/tools2/tools/prog3/prog3.c
 share/examples/mk-configure/tools2/tools/prog4/Makefile
 share/examples/mk-configure/tools2/tools/prog4/prog4.c
-share/mk-configure/custom/endianness
-share/mk-configure/custom/prog_bison
-share/mk-configure/custom/prog_flex
-share/mk-configure/custom/prog_gawk
-share/mk-configure/custom/prog_gm4
+share/mk-configure/builtins/endianness
+share/mk-configure/builtins/prog_bison
+share/mk-configure/builtins/prog_flex
+share/mk-configure/builtins/prog_gawk
+share/mk-configure/builtins/prog_gm4
+share/mk-configure/builtins/prog_gmake
 share/mk-configure/features/getline/getline.c
 share/mk-configure/features/mkc_CIRCLEQ.h
 share/mk-configure/features/mkc_LIST.h
@@ -376,7 +432,6 @@ share/mk-configure/features/netbsd_sys_queue.h
 share/mk-configure/features/netbsd_sys_tree.h
 share/mk-configure/features/strlcat/strlcat.c
 share/mk-configure/features/strlcpy/strlcpy.c
-share/mkc-mk/configure.mk
 share/mkc-mk/mkc.configure.mk
 share/mkc-mk/mkc.files.mk
 share/mkc-mk/mkc.init.mk
@@ -391,8 +446,11 @@ share/mkc-mk/mkc.subprj.mk
 share/mkc-mk/mkc.subprjs.mk
 share/mkc-mk/mkc_imp.arch.mk
 share/mkc-mk/mkc_imp.checkprogs.mk
+share/mkc-mk/mkc_imp.conf-cleanup.mk
 share/mkc-mk/mkc_imp.conf-final.mk
+share/mkc-mk/mkc_imp.conf.mk
 share/mkc-mk/mkc_imp.dep.mk
+share/mkc-mk/mkc_imp.dpvars.mk
 share/mkc-mk/mkc_imp.f_CIRCLEQ.mk
 share/mkc-mk/mkc_imp.f_LIST.mk
 share/mkc-mk/mkc_imp.f_RB.mk
diff --git a/devel/mk-configure/distinfo b/devel/mk-configure/distinfo
index 503ae184c10..7ec103ac40d 100644
--- a/devel/mk-configure/distinfo
+++ b/devel/mk-configure/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2014/07/13 15:52:36 cheusov Exp $
+$NetBSD: distinfo,v 1.13 2014/09/14 13:11:39 cheusov Exp $
 
-SHA1 (mk-configure-0.27.0.tar.gz) = 97f2f6a3332f06d2cb8ceaba8da5e6248726bc1f
-RMD160 (mk-configure-0.27.0.tar.gz) = b57125165fbe6f7c0c612e6195424aed477f2e66
-Size (mk-configure-0.27.0.tar.gz) = 277250 bytes
+SHA1 (mk-configure-0.28.0.tar.gz) = 5933c5d35447786a1ecdaef8bf3ddf11d3b2d165
+RMD160 (mk-configure-0.28.0.tar.gz) = cca733b048ceef58d87fa440a44f545d236f4821
+Size (mk-configure-0.28.0.tar.gz) = 293673 bytes
diff --git a/devel/mk-configure/mk-c.mk b/devel/mk-configure/mk-c.mk
index 08a4560ce94..caf5c2a0164 100644
--- a/devel/mk-configure/mk-c.mk
+++ b/devel/mk-configure/mk-c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mk-c.mk,v 1.4 2014/07/13 15:52:36 cheusov Exp $
+# $NetBSD: mk-c.mk,v 1.5 2014/09/14 13:11:39 cheusov Exp $
 
 TOOL_DEPENDS+=	${BUILDLINK_API_DEPENDS.mk-c}:${BUILDLINK_PKGSRCDIR.mk-c}
 
@@ -18,7 +18,7 @@ BUILDLINK_TREE+=	mk-c
 .if !defined(MK_CONFIGURE_BUILDLINK3_MK)
 MK_CONFIGURE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mk-c+=	mk-configure>=0.27.0
+BUILDLINK_API_DEPENDS.mk-c+=	mk-configure>=0.28.0
 BUILDLINK_PKGSRCDIR.mk-c=	../../devel/mk-configure
 BUILDLINK_DEPMETHOD.mk-c=	build
 BUILDLINK_INCDIRS.mk-c=		include share/mk-configure/features