From fa2749d158e2ce1a9af7f10364b91b25ac97cab6 Mon Sep 17 00:00:00 2001 From: cheusov Date: Tue, 14 Jan 2014 01:09:20 +0000 Subject: [PATCH] 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. --- pkgtools/pkg_summary-utils/Makefile | 25 ++++++++++++++----------- pkgtools/pkg_summary-utils/PLIST | 4 +++- pkgtools/pkg_summary-utils/distinfo | 8 ++++---- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgtools/pkg_summary-utils/Makefile b/pkgtools/pkg_summary-utils/Makefile index 0b7cadd9bcb2..f8dbccfacedb 100644 --- a/pkgtools/pkg_summary-utils/Makefile +++ b/pkgtools/pkg_summary-utils/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2014/01/03 18:13:37 cheusov Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/14 01:09:20 cheusov Exp $ -DISTNAME= pkg_summary-utils-0.62.0 -PKGREVISION= 1 +DISTNAME= pkg_summary-utils-0.63.0 CATEGORIES= pkgtools MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/psu/ \ http://www.mova.org/~cheusov/pub/pkg_summary-utils/ @@ -16,7 +15,7 @@ DEPENDS+= runawk>=1.1.0:../../lang/runawk DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus DEPENDS+= digest-[0-9]*:../../pkgtools/digest -BUILD_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure +BUILD_DEPENDS+= mk-configure>=0.24.0:../../devel/mk-configure CONFLICTS+= awk-pkgsrc-dewey-[0-9]* CONFLICTS+= pkg_src_summary-[0-9]* @@ -31,7 +30,10 @@ CONFLICTS+= pkg_summary4view-[0-9]* # bmake test TESTS='pkg_subgraph_deps pkg_bin_summary ...' TEST_TARGET= test -USE_LANGUAGES= #empty +BUILD_TARGET= all all-doc +INSTALL_TARGET= install install-doc + +USE_LANGUAGES= c USE_TOOLS+= gzip:run PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -40,15 +42,16 @@ EGDIR= ${PREFIX}/share/examples/pkg_summary-utils CONF_FILES= ${EGDIR}/pkg_digger.conf ${PKG_SYSCONFDIR}/pkg_digger.conf -REPLACE_SH= tests/test.sh pkg_digger.in pkg_digger_backend.in \ - pkg_summary2build_graph.in +REPLACE_SH= tests/test.sh scripts/pkg_digger.in scripts/pkg_digger_backend.in \ + scripts/pkg_summary2build_graph.in REPLACE_INTERPRETER+= runawk REPLACE.runawk.old= .*runawk REPLACE.runawk.new= ${PREFIX}/bin/runawk -REPLACE_FILES.runawk= get_processed_pkgs.in pkg_*.in XB2bin_summary.in \ - direct_deps.in summary2multi_variants.in enrich_summary.in \ - makefiles2deps.in +REPLACE_FILES.runawk= scripts/get_processed_pkgs.in scripts/pkg_*.in \ + scripts/XB2bin_summary.in scripts/direct_deps.in \ + scripts/summary2multi_variants.in scripts/enrich_summary.in \ + scripts/makefiles2deps.in MAKE_ENV+= AWKMODDIR=${PREFIX}/share/runawk MAKE_ENV+= EGDIR=${EGDIR} @@ -57,7 +60,7 @@ MAKE_ENV+= BMAKE=${MAKE:Q} MAKE_ENV+= DISTDIR=${DISTDIR} MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR} MAKE_ENV+= PKG_SUFX=${PKG_SUFX} -MAKE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q} +MAKE_ENV+= PKG_TOOLS_BIN=${PKG_TOOLS_BIN:Q} MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} .include "../../devel/mk-configure/mk-c.mk" diff --git a/pkgtools/pkg_summary-utils/PLIST b/pkgtools/pkg_summary-utils/PLIST index ace0610189b6..67047acb473c 100644 --- a/pkgtools/pkg_summary-utils/PLIST +++ b/pkgtools/pkg_summary-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2012/11/04 17:09:21 cheusov Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/01/14 01:09:20 cheusov Exp $ bin/cvs_checksum bin/makefiles2deps bin/pkg_assignments2pkgpath @@ -29,6 +29,7 @@ libexec/psu/XB2bin_summary libexec/psu/direct_deps libexec/psu/enrich_summary libexec/psu/get_processed_pkgs +libexec/psu/grep_summary libexec/psu/sig_handler.sh libexec/psu/summary2multi_variants man/man1/cvs_checksum.1 @@ -54,6 +55,7 @@ man/man1/pkg_uniq_summary.1 man/man1/pkg_update_src_summary.1 man/man1/pkg_update_summary.1 man/man7/pkg_summary-utils.7 +share/doc/pkg_summary-utils/LICENSE share/doc/pkg_summary-utils/NEWS share/doc/pkg_summary-utils/README share/doc/pkg_summary-utils/TODO diff --git a/pkgtools/pkg_summary-utils/distinfo b/pkgtools/pkg_summary-utils/distinfo index 8e01b9823715..bd6059239015 100644 --- a/pkgtools/pkg_summary-utils/distinfo +++ b/pkgtools/pkg_summary-utils/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.18 2013/05/16 01:24:09 cheusov Exp $ +$NetBSD: distinfo,v 1.19 2014/01/14 01:09:20 cheusov Exp $ -SHA1 (pkg_summary-utils-0.62.0.tar.gz) = c3452342a54c373a35265b4b1dc9e6479c249850 -RMD160 (pkg_summary-utils-0.62.0.tar.gz) = 4f8ce20533c24a4ae27c753d89a96505e8fcfabf -Size (pkg_summary-utils-0.62.0.tar.gz) = 109290 bytes +SHA1 (pkg_summary-utils-0.63.0.tar.gz) = 5f5cbe7f2ec0238db8957908440f6d1ba00c4970 +RMD160 (pkg_summary-utils-0.63.0.tar.gz) = cab479d00b2bbf91053dd2c785209ba42940b607 +Size (pkg_summary-utils-0.63.0.tar.gz) = 116473 bytes