Updated to versiopn 0.63.0: pkg_grep_summary: - almost all search strategies were reimplemented in C for better performance, as a result all utilities using pkg_grep_summary(1) work much faster. Strategies still implemented in AWK: awk, kw. - converted to use shell's getopts. - new regression tests. pkg_src_summary: - if -m, -d, -D aren't applied, temporary files are not created. - adapted for recent paexec(1) improvements. pkg_update_src_summary: - progress counter is output if -v is applied. pkg_summary2deps: - workaround for buggy patterns like >=foo-1.* was implemented. pkg_summary-utils build infrastructure is completely reimplemented. Now it is a two-level project. Subprojects: scripts and grep_summary (enabled by default), doc and tests. PKG_TOOLS_BIN env. variable is used at build time as a default directory for pkg_info(8) (for OpenBSD/FreeBSD in order to avoid conflicts with their native pkg_* tools). A number of stupid workarounds for stupid Solaris' userlevel. All scripts written in shell uses @SH@ in shebang and therefore uses pkgsrc's ${SH} at run time.diff -r1.29 -r1.30 pkgsrc/pkgtools/pkg_summary-utils/Makefile
(cheusov)
@@ -1,64 +1,67 @@ | @@ -1,64 +1,67 @@ | |||
1 | # $NetBSD: Makefile,v 1.29 2014/01/03 18:13:37 cheusov Exp $ | 1 | # $NetBSD: Makefile,v 1.30 2014/01/14 01:09:20 cheusov Exp $ | |
2 | 2 | |||
3 | DISTNAME= pkg_summary-utils-0.62.0 | 3 | DISTNAME= pkg_summary-utils-0.63.0 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= pkgtools | 4 | CATEGORIES= pkgtools | |
6 | MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/psu/ \ | 5 | MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/psu/ \ | |
7 | http://www.mova.org/~cheusov/pub/pkg_summary-utils/ | 6 | http://www.mova.org/~cheusov/pub/pkg_summary-utils/ | |
8 | 7 | |||
9 | MAINTAINER= cheusov@NetBSD.org | 8 | MAINTAINER= cheusov@NetBSD.org | |
10 | HOMEPAGE= http://www.mova.org/~cheusov/pub/pkg_summary-utils/ | 9 | HOMEPAGE= http://www.mova.org/~cheusov/pub/pkg_summary-utils/ | |
11 | COMMENT= Utilities for manipulating pkg_summary(5) files | 10 | COMMENT= Utilities for manipulating pkg_summary(5) files | |
12 | LICENSE= 2-clause-bsd | 11 | LICENSE= 2-clause-bsd | |
13 | 12 | |||
14 | DEPENDS+= paexec>=0.19.1:../../parallel/paexec | 13 | DEPENDS+= paexec>=0.19.1:../../parallel/paexec | |
15 | DEPENDS+= runawk>=1.1.0:../../lang/runawk | 14 | DEPENDS+= runawk>=1.1.0:../../lang/runawk | |
16 | DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus | 15 | DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus | |
17 | DEPENDS+= digest-[0-9]*:../../pkgtools/digest | 16 | DEPENDS+= digest-[0-9]*:../../pkgtools/digest | |
18 | 17 | |||
19 | BUILD_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure | 18 | BUILD_DEPENDS+= mk-configure>=0.24.0:../../devel/mk-configure | |
20 | 19 | |||
21 | CONFLICTS+= awk-pkgsrc-dewey-[0-9]* | 20 | CONFLICTS+= awk-pkgsrc-dewey-[0-9]* | |
22 | CONFLICTS+= pkg_src_summary-[0-9]* | 21 | CONFLICTS+= pkg_src_summary-[0-9]* | |
23 | CONFLICTS+= pkg_cmp_summary-[0-9]* | 22 | CONFLICTS+= pkg_cmp_summary-[0-9]* | |
24 | CONFLICTS+= pkg_src_update_summary-[0-9]* | 23 | CONFLICTS+= pkg_src_update_summary-[0-9]* | |
25 | CONFLICTS+= pkg_update_summary-[0-9]* | 24 | CONFLICTS+= pkg_update_summary-[0-9]* | |
26 | CONFLICTS+= pkg_summary4view-[0-9]* | 25 | CONFLICTS+= pkg_summary4view-[0-9]* | |
27 | 26 | |||
28 | # usage: | 27 | # usage: | |
29 | # bmake test | 28 | # bmake test | |
30 | # bmake test TESTS='show-tests' | 29 | # bmake test TESTS='show-tests' | |
31 | # bmake test TESTS='pkg_subgraph_deps pkg_bin_summary ...' | 30 | # bmake test TESTS='pkg_subgraph_deps pkg_bin_summary ...' | |
32 | TEST_TARGET= test | 31 | TEST_TARGET= test | |
33 | 32 | |||
34 | USE_LANGUAGES= #empty | 33 | BUILD_TARGET= all all-doc | |
34 | INSTALL_TARGET= install install-doc | |||
35 | ||||
36 | USE_LANGUAGES= c | |||
35 | USE_TOOLS+= gzip:run | 37 | USE_TOOLS+= gzip:run | |
36 | 38 | |||
37 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 39 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
38 | 40 | |||
39 | EGDIR= ${PREFIX}/share/examples/pkg_summary-utils | 41 | EGDIR= ${PREFIX}/share/examples/pkg_summary-utils | |
40 | 42 | |||
41 | CONF_FILES= ${EGDIR}/pkg_digger.conf ${PKG_SYSCONFDIR}/pkg_digger.conf | 43 | CONF_FILES= ${EGDIR}/pkg_digger.conf ${PKG_SYSCONFDIR}/pkg_digger.conf | |
42 | 44 | |||
43 | REPLACE_SH= tests/test.sh pkg_digger.in pkg_digger_backend.in \ | 45 | REPLACE_SH= tests/test.sh scripts/pkg_digger.in scripts/pkg_digger_backend.in \ | |
44 | pkg_summary2build_graph.in | 46 | scripts/pkg_summary2build_graph.in | |
45 | 47 | |||
46 | REPLACE_INTERPRETER+= runawk | 48 | REPLACE_INTERPRETER+= runawk | |
47 | REPLACE.runawk.old= .*runawk | 49 | REPLACE.runawk.old= .*runawk | |
48 | REPLACE.runawk.new= ${PREFIX}/bin/runawk | 50 | REPLACE.runawk.new= ${PREFIX}/bin/runawk | |
49 | REPLACE_FILES.runawk= get_processed_pkgs.in pkg_*.in XB2bin_summary.in \ | 51 | REPLACE_FILES.runawk= scripts/get_processed_pkgs.in scripts/pkg_*.in \ | |
50 | direct_deps.in summary2multi_variants.in enrich_summary.in \ | 52 | scripts/XB2bin_summary.in scripts/direct_deps.in \ | |
51 | makefiles2deps.in | 53 | scripts/summary2multi_variants.in scripts/enrich_summary.in \ | |
54 | scripts/makefiles2deps.in | |||
52 | 55 | |||
53 | MAKE_ENV+= AWKMODDIR=${PREFIX}/share/runawk | 56 | MAKE_ENV+= AWKMODDIR=${PREFIX}/share/runawk | |
54 | MAKE_ENV+= EGDIR=${EGDIR} | 57 | MAKE_ENV+= EGDIR=${EGDIR} | |
55 | MAKE_ENV+= SH=${SH:Q} | 58 | MAKE_ENV+= SH=${SH:Q} | |
56 | MAKE_ENV+= BMAKE=${MAKE:Q} | 59 | MAKE_ENV+= BMAKE=${MAKE:Q} | |
57 | MAKE_ENV+= DISTDIR=${DISTDIR} | 60 | MAKE_ENV+= DISTDIR=${DISTDIR} | |
58 | MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR} | 61 | MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR} | |
59 | MAKE_ENV+= PKG_SUFX=${PKG_SUFX} | 62 | MAKE_ENV+= PKG_SUFX=${PKG_SUFX} | |
60 | MAKE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q} | 63 | MAKE_ENV+= PKG_TOOLS_BIN=${PKG_TOOLS_BIN:Q} | |
61 | MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} | 64 | MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} | |
62 | 65 | |||
63 | .include "../../devel/mk-configure/mk-c.mk" | 66 | .include "../../devel/mk-configure/mk-c.mk" | |
64 | .include "../../mk/bsd.pkg.mk" | 67 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.5 2012/11/04 17:09:21 cheusov Exp $ | 1 | @comment $NetBSD: PLIST,v 1.6 2014/01/14 01:09:20 cheusov Exp $ | |
2 | bin/cvs_checksum | 2 | bin/cvs_checksum | |
3 | bin/makefiles2deps | 3 | bin/makefiles2deps | |
4 | bin/pkg_assignments2pkgpath | 4 | bin/pkg_assignments2pkgpath | |
5 | bin/pkg_bin_summary | 5 | bin/pkg_bin_summary | |
6 | bin/pkg_cleanup_distdir | 6 | bin/pkg_cleanup_distdir | |
7 | bin/pkg_cmp_summary | 7 | bin/pkg_cmp_summary | |
8 | bin/pkg_digger | 8 | bin/pkg_digger | |
9 | bin/pkg_digger_backend | 9 | bin/pkg_digger_backend | |
10 | bin/pkg_digger_installed | 10 | bin/pkg_digger_installed | |
11 | bin/pkg_digger_summary | 11 | bin/pkg_digger_summary | |
12 | bin/pkg_grep_summary | 12 | bin/pkg_grep_summary | |
13 | bin/pkg_lint_summary | 13 | bin/pkg_lint_summary | |
14 | bin/pkg_list_all_pkgs | 14 | bin/pkg_list_all_pkgs | |
@@ -19,46 +19,48 @@ bin/pkg_src_summary | @@ -19,46 +19,48 @@ bin/pkg_src_summary | |||
19 | bin/pkg_subgraph_deps | 19 | bin/pkg_subgraph_deps | |
20 | bin/pkg_summary2bb_pkgs | 20 | bin/pkg_summary2bb_pkgs | |
21 | bin/pkg_summary2build_graph | 21 | bin/pkg_summary2build_graph | |
22 | bin/pkg_summary2deps | 22 | bin/pkg_summary2deps | |
23 | bin/pkg_summary2leaves | 23 | bin/pkg_summary2leaves | |
24 | bin/pkg_summary4view | 24 | bin/pkg_summary4view | |
25 | bin/pkg_uniq_summary | 25 | bin/pkg_uniq_summary | |
26 | bin/pkg_update_src_summary | 26 | bin/pkg_update_src_summary | |
27 | bin/pkg_update_summary | 27 | bin/pkg_update_summary | |
28 | libexec/psu/XB2bin_summary | 28 | libexec/psu/XB2bin_summary | |
29 | libexec/psu/direct_deps | 29 | libexec/psu/direct_deps | |
30 | libexec/psu/enrich_summary | 30 | libexec/psu/enrich_summary | |
31 | libexec/psu/get_processed_pkgs | 31 | libexec/psu/get_processed_pkgs | |
32 | libexec/psu/grep_summary | |||
32 | libexec/psu/sig_handler.sh | 33 | libexec/psu/sig_handler.sh | |
33 | libexec/psu/summary2multi_variants | 34 | libexec/psu/summary2multi_variants | |
34 | man/man1/cvs_checksum.1 | 35 | man/man1/cvs_checksum.1 | |
35 | man/man1/makefiles2deps.1 | 36 | man/man1/makefiles2deps.1 | |
36 | man/man1/pkg_bin_summary.1 | 37 | man/man1/pkg_bin_summary.1 | |
37 | man/man1/pkg_cleanup_distdir.1 | 38 | man/man1/pkg_cleanup_distdir.1 | |
38 | man/man1/pkg_cmp_summary.1 | 39 | man/man1/pkg_cmp_summary.1 | |
39 | man/man1/pkg_digger.1 | 40 | man/man1/pkg_digger.1 | |
40 | man/man1/pkg_digger_installed.1 | 41 | man/man1/pkg_digger_installed.1 | |
41 | man/man1/pkg_digger_summary.1 | 42 | man/man1/pkg_digger_summary.1 | |
42 | man/man1/pkg_grep_summary.1 | 43 | man/man1/pkg_grep_summary.1 | |
43 | man/man1/pkg_lint_summary.1 | 44 | man/man1/pkg_lint_summary.1 | |
44 | man/man1/pkg_list_all_pkgs.1 | 45 | man/man1/pkg_list_all_pkgs.1 | |
45 | man/man1/pkg_micro_src_summary.1 | 46 | man/man1/pkg_micro_src_summary.1 | |
46 | man/man1/pkg_refresh_summary.1 | 47 | man/man1/pkg_refresh_summary.1 | |
47 | man/man1/pkg_src_summary.1 | 48 | man/man1/pkg_src_summary.1 | |
48 | man/man1/pkg_subgraph_deps.1 | 49 | man/man1/pkg_subgraph_deps.1 | |
49 | man/man1/pkg_summary2build_graph.1 | 50 | man/man1/pkg_summary2build_graph.1 | |
50 | man/man1/pkg_summary2deps.1 | 51 | man/man1/pkg_summary2deps.1 | |
51 | man/man1/pkg_summary2leaves.1 | 52 | man/man1/pkg_summary2leaves.1 | |
52 | man/man1/pkg_summary4view.1 | 53 | man/man1/pkg_summary4view.1 | |
53 | man/man1/pkg_uniq_summary.1 | 54 | man/man1/pkg_uniq_summary.1 | |
54 | man/man1/pkg_update_src_summary.1 | 55 | man/man1/pkg_update_src_summary.1 | |
55 | man/man1/pkg_update_summary.1 | 56 | man/man1/pkg_update_summary.1 | |
56 | man/man7/pkg_summary-utils.7 | 57 | man/man7/pkg_summary-utils.7 | |
58 | share/doc/pkg_summary-utils/LICENSE | |||
57 | share/doc/pkg_summary-utils/NEWS | 59 | share/doc/pkg_summary-utils/NEWS | |
58 | share/doc/pkg_summary-utils/README | 60 | share/doc/pkg_summary-utils/README | |
59 | share/doc/pkg_summary-utils/TODO | 61 | share/doc/pkg_summary-utils/TODO | |
60 | share/examples/pkg_summary-utils/pkg_digger.conf | 62 | share/examples/pkg_summary-utils/pkg_digger.conf | |
61 | share/psu_mk/pkg_src_summary.mk | 63 | share/psu_mk/pkg_src_summary.mk | |
62 | share/runawk/pkg_grep_summary.awk | 64 | share/runawk/pkg_grep_summary.awk | |
63 | share/runawk/pkgsrc-dewey.awk | 65 | share/runawk/pkgsrc-dewey.awk | |
64 | share/runawk/psu_funcs.awk | 66 | share/runawk/psu_funcs.awk |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.18 2013/05/16 01:24:09 cheusov Exp $ | 1 | $NetBSD: distinfo,v 1.19 2014/01/14 01:09:20 cheusov Exp $ | |
2 | 2 | |||
3 | SHA1 (pkg_summary-utils-0.62.0.tar.gz) = c3452342a54c373a35265b4b1dc9e6479c249850 | 3 | SHA1 (pkg_summary-utils-0.63.0.tar.gz) = 5f5cbe7f2ec0238db8957908440f6d1ba00c4970 | |
4 | RMD160 (pkg_summary-utils-0.62.0.tar.gz) = 4f8ce20533c24a4ae27c753d89a96505e8fcfabf | 4 | RMD160 (pkg_summary-utils-0.63.0.tar.gz) = cab479d00b2bbf91053dd2c785209ba42940b607 | |
5 | Size (pkg_summary-utils-0.62.0.tar.gz) = 109290 bytes | 5 | Size (pkg_summary-utils-0.63.0.tar.gz) = 116473 bytes |