CVS commit: pkgsrc/devel/mk-configure

["Aleksey Cheusov" <cheusov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cheusov
Date:           Wed Jan  6 13:05:50 UTC 2021

Modified Files:
        pkgsrc/devel/mk-configure: Makefile PLIST distinfo mk-c.mk

Log Message:
Update to mk-configure-0.36.0

  Introduce new variables:
    * CFLAGS_<source>, CXXFLAGS_<source> and CPPFLAGS_<source>.
      Now one can add some C/C++ compilation flags on per source file
      basis.
    * CCSTD and CXXSTD.
      Now projects based on mk-configure may require
      standard-compliant compiler, for example, C99.
    * CFLAGS0 and CXXFLAGS0.
    * MKCOMPILERSETTINGS.
      See README.for_packagers file for details

  Internal mk files are included only if it is really necessary.  For
  example, mkc_imp.incs.mk is included only if variable INCS is not
  empty. In theory, this should speed-up mkcmake.

  New features: humanize_number, shquote and pwdgrp.

  Deprecate some things:
    * implicit MAN page, that is when MAN variable is not set,
      but man file exists
    * ~/.mk-c directory and @sysconfdir@/mk-c.conf file.
      Please rename them to ~/.mkcmake and
      @sysconfdir@/mkcmake.conf respectively.

  Add preliminary support for ARMCC compiler.

  Optimize installation of directories, run "install -d" once for all
  created directories.

  mkc.lib.mk: after building libraries ${.CURDIR:T}.done file is
  created.  This file is used later for handling inter-project
  dependencies specified by LIBDEPS variable.

  mk-configure.7: document all variables in alphabetic order.
  I hope this makes navigation in the documentation easier.

  Fixes:
    * tests/failed_requirements: fix failure on freebsd
      (strict printf(1))
    * examples/require_tools/fake: make it a real script


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/mk-configure/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/mk-configure/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/mk-configure/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/mk-configure/mk-c.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/mk-configure/Makefile
diff -u pkgsrc/devel/mk-configure/Makefile:1.35 pkgsrc/devel/mk-configure/Makefile:1.36
--- pkgsrc/devel/mk-configure/Makefile:1.35     Thu Nov 26 19:47:54 2020
+++ pkgsrc/devel/mk-configure/Makefile  Wed Jan  6 13:05:50 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2020/11/26 19:47:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.36 2021/01/06 13:05:50 cheusov Exp $
 #
 
-DISTNAME=      mk-configure-0.35.0
+DISTNAME=      mk-configure-0.36.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mk-configure/}
 

Index: pkgsrc/devel/mk-configure/PLIST
diff -u pkgsrc/devel/mk-configure/PLIST:1.18 pkgsrc/devel/mk-configure/PLIST:1.19
--- pkgsrc/devel/mk-configure/PLIST:1.18        Thu Nov 26 19:47:54 2020
+++ pkgsrc/devel/mk-configure/PLIST     Wed Jan  6 13:05:50 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2020/11/26 19:47:54 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.19 2021/01/06 13:05:50 cheusov Exp $
 bin/mkc_check_compiler
 bin/mkc_check_custom
 bin/mkc_check_decl
@@ -76,6 +76,9 @@ share/examples/mk-configure/bswap/Makefi
 share/examples/mk-configure/bswap/expect.out
 share/examples/mk-configure/bswap/prog.c
 share/examples/mk-configure/bswap/test.mk
+share/examples/mk-configure/c99/Makefile
+share/examples/mk-configure/c99/c99_test.c
+share/examples/mk-configure/c99/inline_func.h
 share/examples/mk-configure/calc/Makefile
 share/examples/mk-configure/calc/calc.y
 share/examples/mk-configure/calc/expect.out
@@ -277,6 +280,8 @@ share/examples/mk-configure/helpers/mkc_
 share/examples/mk-configure/helpers/mkc_test_helper3
 share/examples/mk-configure/helpers/mkc_test_helper_paths
 share/examples/mk-configure/helpers/mkc_test_nm
+share/examples/mk-configure/humanize_number/Makefile
+share/examples/mk-configure/humanize_number/prog.c
 share/examples/mk-configure/iconv/Makefile
 share/examples/mk-configure/iconv/expect.out
 share/examples/mk-configure/iconv/hello_iconv.c
@@ -363,6 +368,10 @@ share/examples/mk-configure/requirements
 share/examples/mk-configure/requirements/expect.out
 share/examples/mk-configure/requirements/hello_world.c
 share/examples/mk-configure/requirements/test.mk
+share/examples/mk-configure/shquote/Makefile
+share/examples/mk-configure/shquote/expect.out
+share/examples/mk-configure/shquote/prog.c
+share/examples/mk-configure/shquote/test.mk
 share/examples/mk-configure/sizeof/Makefile
 share/examples/mk-configure/sizeof/expect.out
 share/examples/mk-configure/sizeof/sizeof_test.c
@@ -433,6 +442,9 @@ share/examples/mk-configure/superfs/mkfs
 share/examples/mk-configure/superfs/mkfs_superfs/mkfs_superfs.8
 share/examples/mk-configure/superfs/mkfs_superfs/mkfs_superfs.c
 share/examples/mk-configure/superfs/test.mk
+share/examples/mk-configure/tiny_id/Makefile
+share/examples/mk-configure/tiny_id/test.mk
+share/examples/mk-configure/tiny_id/tiny_id.c
 share/examples/mk-configure/tools/Makefile
 share/examples/mk-configure/tools/expect.out
 share/examples/mk-configure/tools/libs/bar/Makefile
@@ -498,15 +510,16 @@ share/mk-configure/builtins/prog_gmake
 share/mk-configure/builtins/prog_mkdep
 share/mk-configure/builtins/prog_nbmkdep
 share/mk-configure/features/_mkcfake.c
-share/mk-configure/features/dprintf/dprintf.c
-share/mk-configure/features/efun/efun.c
-share/mk-configure/features/err/err.c
-share/mk-configure/features/errc/errc.c
-share/mk-configure/features/errc/verrc.c
-share/mk-configure/features/fgetln/fgetln.c
-share/mk-configure/features/fparseln/fparseln.c
-share/mk-configure/features/getdelim/getdelim.c
-share/mk-configure/features/getline/getline.c
+share/mk-configure/features/dprintf/mkc_dprintf.c
+share/mk-configure/features/efun/mkc_efun.c
+share/mk-configure/features/err/mkc_err.c
+share/mk-configure/features/errc/mkc_errc.c
+share/mk-configure/features/errc/mkc_verrc.c
+share/mk-configure/features/fgetln/mkc_fgetln.c
+share/mk-configure/features/fparseln/mkc_fparseln.c
+share/mk-configure/features/getdelim/mkc_getdelim.c
+share/mk-configure/features/getline/mkc_getline.c
+share/mk-configure/features/humanize_number/mkc_humanize_number.c
 share/mk-configure/features/mkc_CIRCLEQ.h
 share/mk-configure/features/mkc_LIST.h
 share/mk-configure/features/mkc_RB.h
@@ -527,12 +540,15 @@ share/mk-configure/features/mkc_fparseln
 share/mk-configure/features/mkc_fts.h
 share/mk-configure/features/mkc_getdelim.h
 share/mk-configure/features/mkc_getline.h
+share/mk-configure/features/mkc_humanize_number.h
 share/mk-configure/features/mkc_libdl.h
 share/mk-configure/features/mkc_libm.h
 share/mk-configure/features/mkc_posix_getopt.h
 share/mk-configure/features/mkc_progname.h
+share/mk-configure/features/mkc_pwdgrp.h
 share/mk-configure/features/mkc_raise_default_signal.h
 share/mk-configure/features/mkc_reallocarray.h
+share/mk-configure/features/mkc_shquote.h
 share/mk-configure/features/mkc_strlcat.h
 share/mk-configure/features/mkc_strlcpy.h
 share/mk-configure/features/mkc_strndup.h
@@ -541,17 +557,19 @@ share/mk-configure/features/mkc_vis.h
 share/mk-configure/features/mkc_warn.h
 share/mk-configure/features/netbsd_sys_queue.h
 share/mk-configure/features/netbsd_sys_tree.h
-share/mk-configure/features/posix_getopt/posix_getopt.c
-share/mk-configure/features/progname/progname.c
-share/mk-configure/features/raise_default_signal/raise_default_signal.c
-share/mk-configure/features/reallocarray/reallocarray.c
-share/mk-configure/features/strlcat/strlcat.c
-share/mk-configure/features/strlcpy/strlcpy.c
-share/mk-configure/features/strndup/strndup.c
-share/mk-configure/features/strsep/strsep.c
-share/mk-configure/features/vis/unvis.c
-share/mk-configure/features/vis/vis.c
-share/mk-configure/features/warn/warn.c
+share/mk-configure/features/posix_getopt/mkc_posix_getopt.c
+share/mk-configure/features/progname/mkc_progname.c
+share/mk-configure/features/pwdgrp/mkc_pwdgrp.c
+share/mk-configure/features/raise_default_signal/mkc_raise_default_signal.c
+share/mk-configure/features/reallocarray/mkc_reallocarray.c
+share/mk-configure/features/shquote/mkc_shquote.c
+share/mk-configure/features/strlcat/mkc_strlcat.c
+share/mk-configure/features/strlcpy/mkc_strlcpy.c
+share/mk-configure/features/strndup/mkc_strndup.c
+share/mk-configure/features/strsep/mkc_strsep.c
+share/mk-configure/features/vis/mkc_unvis.c
+share/mk-configure/features/vis/mkc_vis.c
+share/mk-configure/features/warn/mkc_warn.c
 share/mk-configure/mk/mkc.compiler_settings.mk
 share/mk-configure/mk/mkc.conf.mk
 share/mk-configure/mk/mkc.configure.mk
@@ -572,6 +590,19 @@ share/mk-configure/mk/mkc_imp.compiler_s
 share/mk-configure/mk/mkc_imp.compiler_type.mk
 share/mk-configure/mk/mkc_imp.conf-cleanup.mk
 share/mk-configure/mk/mkc_imp.conf-final.mk
+share/mk-configure/mk/mkc_imp.conf_custom.mk
+share/mk-configure/mk/mkc_imp.conf_defines.mk
+share/mk-configure/mk/mkc_imp.conf_funclibs.mk
+share/mk-configure/mk/mkc_imp.conf_funcs.mk
+share/mk-configure/mk/mkc_imp.conf_header_files.mk
+share/mk-configure/mk/mkc_imp.conf_headers.mk
+share/mk-configure/mk/mkc_imp.conf_members.mk
+share/mk-configure/mk/mkc_imp.conf_opts.mk
+share/mk-configure/mk/mkc_imp.conf_progs.mk
+share/mk-configure/mk/mkc_imp.conf_prototypes.mk
+share/mk-configure/mk/mkc_imp.conf_sizeof.mk
+share/mk-configure/mk/mkc_imp.conf_types.mk
+share/mk-configure/mk/mkc_imp.conf_vars.mk
 share/mk-configure/mk/mkc_imp.dep.mk
 share/mk-configure/mk/mkc_imp.dpvars.mk
 share/mk-configure/mk/mkc_imp.f_CIRCLEQ.mk
@@ -593,13 +624,16 @@ share/mk-configure/mk/mkc_imp.f_fparseln
 share/mk-configure/mk/mkc_imp.f_fts.mk
 share/mk-configure/mk/mkc_imp.f_getdelim.mk
 share/mk-configure/mk/mkc_imp.f_getline.mk
+share/mk-configure/mk/mkc_imp.f_humanize_number.mk
 share/mk-configure/mk/mkc_imp.f_libdl.mk
 share/mk-configure/mk/mkc_imp.f_libl.mk
 share/mk-configure/mk/mkc_imp.f_libm.mk
 share/mk-configure/mk/mkc_imp.f_posix_getopt.mk
 share/mk-configure/mk/mkc_imp.f_progname.mk
+share/mk-configure/mk/mkc_imp.f_pwdgrp.mk
 share/mk-configure/mk/mkc_imp.f_raise_default_signal.mk
 share/mk-configure/mk/mkc_imp.f_reallocarray.mk
+share/mk-configure/mk/mkc_imp.f_shquote.mk
 share/mk-configure/mk/mkc_imp.f_strlcat.mk
 share/mk-configure/mk/mkc_imp.f_strlcpy.mk
 share/mk-configure/mk/mkc_imp.f_strndup.mk

Index: pkgsrc/devel/mk-configure/distinfo
diff -u pkgsrc/devel/mk-configure/distinfo:1.27 pkgsrc/devel/mk-configure/distinfo:1.28
--- pkgsrc/devel/mk-configure/distinfo:1.27     Thu Nov 26 19:47:54 2020
+++ pkgsrc/devel/mk-configure/distinfo  Wed Jan  6 13:05:50 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2020/11/26 19:47:54 cheusov Exp $
+$NetBSD: distinfo,v 1.28 2021/01/06 13:05:50 cheusov Exp $
 
-SHA1 (mk-configure-0.35.0.tar.gz) = 0a5a173f01a6b2e5ad366ccf1ff8f9ace15fca80
-RMD160 (mk-configure-0.35.0.tar.gz) = 7c852d55ceb114631bb1c578e3f54712fcaff557
-SHA512 (mk-configure-0.35.0.tar.gz) = 2bec7a07786b887188e4ac529eb6c83187525efe065faedc004d9548dd66e3ff3ca28df83a1be1848e5aa58137fbe2b5d3b31bb58de9cf1240d82569a10912d4
-Size (mk-configure-0.35.0.tar.gz) = 354653 bytes
+SHA1 (mk-configure-0.36.0.tar.gz) = 94e1525c04c24c8f1c9f255dcd9ea11de08399fd
+RMD160 (mk-configure-0.36.0.tar.gz) = f483ba323c7fdd21a921544dea2b8af06124b216
+SHA512 (mk-configure-0.36.0.tar.gz) = ce0b586601a6112218501de355ef4d2ca6cf7a0c4b040ddafa11c3c948eb029bd99402c2585013b3f0d300e266c689170a11d18af4aa8542f0a72ef4aa1b2a09
+Size (mk-configure-0.36.0.tar.gz) = 363486 bytes

Index: pkgsrc/devel/mk-configure/mk-c.mk
diff -u pkgsrc/devel/mk-configure/mk-c.mk:1.9 pkgsrc/devel/mk-configure/mk-c.mk:1.10
--- pkgsrc/devel/mk-configure/mk-c.mk:1.9       Mon Mar 30 14:10:55 2020
+++ pkgsrc/devel/mk-configure/mk-c.mk   Wed Jan  6 13:05:50 2021
@@ -1,10 +1,11 @@
-# $NetBSD: mk-c.mk,v 1.9 2020/03/30 14:10:55 cheusov Exp $
+# $NetBSD: mk-c.mk,v 1.10 2021/01/06 13:05:50 cheusov Exp $
 
 TOOL_DEPENDS+= ${BUILDLINK_API_DEPENDS.mk-c}:${BUILDLINK_PKGSRCDIR.mk-c}
 
 MAKE_PROGRAM=          ${PREFIX}/bin/mkcmake
-MAKE_ENV+=             MANDIR=${PREFIX}/${PKGMANDIR} INSTALL=${INSTALL:Q}
+MAKE_ENV+=             MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_ENV+=             SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+=             MKCOMPILERSETTINGS=yes
 CONFIGURE_TARGET?=     configure
 
 do-configure: