Updatd to version 0.12.0: Most important parts of pkg_grep_summary, a part of pkgtools/pkg_summary-utils, was reimplemented in C. As a result "nih {search,info,meta,leaf,install,remove,deps}" should work faster. nih install: - if pkg_update_plan(1) fails, nih(1) exits with pkg_update_plan's exit status. - packages to be installed or removed are output in sorted order. nih {search,meta,info}: - "nih meta" now defaults to -1 mode (internally). - documentation for -1|-3|-9 ads added for "nih {info,meta}" commands - "nih info" now defaults to -3 mode. - "nih {search,meta,info}" now work correctly with -{o,i} options if ~/.nih/pkg_summary.txt is absent. - new option -l was added to "nih {search,info}" that outputs package file list. Summary for installed packages is cached in ~/.nih/pkg_inst_summary.txt. "nih {refresh,search,info,meta,deps,list} -i" use this file and update it when necessary. nih refresh: - Option -P was added for fully rescanning pkgsrc tree. - The default value for PKGSRCDIR is not determined at build time anymore. As a result "nih refresh -p" does not try to access /tree/pkgsrc used by bouyer@ who builds official NetBSD binary packages. Now PKGSRCDIR defaults to /usr/pkgsrc. - "nih refresh -p" shows progress counter (the number of scanned packages) unless -m is in PSS_OPTIONS. - option -i was added that updates summaries for installed packages (~/.nih/pkg_inst_summary.txt). nih remove: - does not try to create $CACHEDIR and "cd" to it. nih list: - was completely reimplemented and simplified. - new option -p was added that outputs pkgsrc tree packages. nih deps: - new options -b and -p were added for working with binary repository and pkgsrc scanned packages (pkg_summary.txt ad pkg_src_summary.txt respectively) - option -1 was added that outputs direct dependencies or dependents. nih/config: - better conversion from "uname -r" to repository URL. - REPOSITORY for SunOS defaults to smartos.org. Support for summaries with no PKGPATH, e.g., compat50-5.1.tgz, was added. Option -I for "list", "deps', "meta", "info" and "search" was renamed to -i. Option -I is supported for backward compatibility. package_search.pdf was updated, fixed and improved.diff -r1.19 -r1.20 pkgsrc/pkgtools/nih/Makefile
(cheusov)
@@ -1,62 +1,60 @@ | @@ -1,62 +1,60 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2013/03/08 13:04:32 cheusov Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2014/01/14 01:16:28 cheusov Exp $ | |
2 | 2 | |||
3 | DISTNAME= pkgnih-0.11.0 | 3 | DISTNAME= pkgnih-0.12.0 | |
4 | PKGNAME= ${DISTNAME:S/pkgnih/nih/} | 4 | PKGNAME= ${DISTNAME:S/pkgnih/nih/} | |
5 | CATEGORIES= pkgtools | 5 | CATEGORIES= pkgtools | |
6 | MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/ \ | 6 | MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/ \ | |
7 | http://mova.org/~cheusov/pub/pkgnih/ | 7 | http://mova.org/~cheusov/pub/pkgnih/ | |
8 | 8 | |||
9 | MAINTAINER= cheusov@NetBSD.org | 9 | MAINTAINER= cheusov@NetBSD.org | |
10 | HOMEPAGE= https://github.com/cheusov/pkgnih | 10 | HOMEPAGE= https://github.com/cheusov/pkgnih | |
11 | COMMENT= Package manager for pkgsrc | 11 | COMMENT= Package manager for pkgsrc | |
12 | LICENSE= 2-clause-bsd | 12 | LICENSE= 2-clause-bsd | |
13 | 13 | |||
14 | DEPENDS+= pkg_summary-utils>=0.60.0:../../pkgtools/pkg_summary-utils | 14 | DEPENDS+= pkg_summary-utils>=0.63.0:../../pkgtools/pkg_summary-utils | |
15 | DEPENDS+= digest-[0-9]*:../../pkgtools/digest | 15 | DEPENDS+= digest-[0-9]*:../../pkgtools/digest | |
16 | DEPENDS+= pkg_install>=20100915:../../pkgtools/pkg_install | 16 | DEPENDS+= pkg_install>=20100915:../../pkgtools/pkg_install | |
17 | 17 | |||
18 | BUILD_DEPENDS+= mk-configure>=0.21.0:../../devel/mk-configure | 18 | BUILD_DEPENDS+= mk-configure>=0.21.0:../../devel/mk-configure | |
19 | 19 | |||
20 | CONFLICTS= pkg_status-[0-9]* | 20 | CONFLICTS= pkg_status-[0-9]* | |
21 | SUPERSEDES= pkgnih-[0-9]* | 21 | SUPERSEDES= pkgnih-[0-9]* | |
22 | 22 | |||
23 | BUILD_TARGET= all all-doc | 23 | BUILD_TARGET= all all-doc | |
24 | INSTALL_TARGET= install install-doc | 24 | INSTALL_TARGET= install install-doc | |
25 | 25 | |||
26 | EGDIR= ${PREFIX}/share/examples/nih | 26 | EGDIR= ${PREFIX}/share/examples/nih | |
27 | 27 | |||
28 | CONF_FILES= ${EGDIR}/nih.conf \ | 28 | CONF_FILES= ${EGDIR}/nih.conf \ | |
29 | ${PKG_SYSCONFDIR}/nih/config | 29 | ${PKG_SYSCONFDIR}/nih/config | |
30 | 30 | |||
31 | MAKE_DIRS+= ${PKG_SYSCONFDIR}/nih | 31 | MAKE_DIRS+= ${PKG_SYSCONFDIR}/nih | |
32 | 32 | |||
33 | REPLACE_INTERPRETER+= runawk | 33 | REPLACE_INTERPRETER+= runawk | |
34 | REPLACE.runawk.old= .*runawk | 34 | REPLACE.runawk.old= .*runawk | |
35 | REPLACE.runawk.new= ${PREFIX}/bin/runawk | 35 | REPLACE.runawk.new= ${PREFIX}/bin/runawk | |
36 | REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in \ | 36 | REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in \ | |
37 | nih/pkg_create_fake.in nih/analyse_conflicts.in | 37 | nih/pkg_create_fake.in nih/analyse_conflicts.in | |
38 | 38 | |||
39 | MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR} | |||
40 | MAKE_ENV+= PACKAGES=${PACKAGES} | |||
41 | MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} | 39 | MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} | |
42 | MAKE_ENV+= REAL_ROOT_USER=${REAL_ROOT_USER} | 40 | MAKE_ENV+= REAL_ROOT_USER=${REAL_ROOT_USER} | |
43 | MAKE_ENV+= REAL_ROOT_GROUP=${REAL_ROOT_GROUP} | 41 | MAKE_ENV+= REAL_ROOT_GROUP=${REAL_ROOT_GROUP} | |
44 | 42 | |||
45 | .include "../../mk/bsd.prefs.mk" | 43 | .include "../../mk/bsd.prefs.mk" | |
46 | 44 | |||
47 | .if ${OPSYS} == NetBSD || ${OPSYS} == FreeBSD || ${OPSYS} == OpenBSD || \ | 45 | .if ${OPSYS} == NetBSD || ${OPSYS} == FreeBSD || ${OPSYS} == OpenBSD || \ | |
48 | ${OPSYS} == DragonFly || ${OPSYS} == MirBSD | 46 | ${OPSYS} == DragonFly || ${OPSYS} == MirBSD | |
49 | FTP_CMD=/usr/bin/ftp | 47 | FTP_CMD=/usr/bin/ftp | |
50 | .else | 48 | .else | |
51 | FTP_CMD=${PREFIX}/bin/ftp | 49 | FTP_CMD=${PREFIX}/bin/ftp | |
52 | DEPENDS+= tnftp-[0-9]*:../../net/tnftp | 50 | DEPENDS+= tnftp-[0-9]*:../../net/tnftp | |
53 | .endif | 51 | .endif | |
54 | 52 | |||
55 | MAKE_ENV+= FTP=${FTP_CMD:Q} | 53 | MAKE_ENV+= FTP=${FTP_CMD:Q} PKG_TOOLS_BIN=${PKG_TOOLS_BIN} | |
56 | 54 | |||
57 | .if ${OPSYS} =="SunOS" #&& empty(OS_VERSION:M5.11*) | 55 | .if ${OPSYS} =="SunOS" #&& empty(OS_VERSION:M5.11*) | |
58 | REPLACE_SH+= nih/nih.in nih/pkg_status.in | 56 | REPLACE_SH+= nih/nih.in nih/pkg_status.in | |
59 | .endif | 57 | .endif | |
60 | 58 | |||
61 | .include "../../devel/mk-configure/mk-c.mk" | 59 | .include "../../devel/mk-configure/mk-c.mk" | |
62 | .include "../../mk/bsd.pkg.mk" | 60 | .include "../../mk/bsd.pkg.mk" |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.5 2013/03/08 13:04:32 cheusov Exp $ | 1 | @comment $NetBSD: PLIST,v 1.6 2014/01/14 01:16:28 cheusov Exp $ | |
2 | bin/nih | 2 | bin/nih | |
3 | bin/pkg_status | 3 | bin/pkg_status | |
4 | bin/pkg_update_plan | 4 | bin/pkg_update_plan | |
5 | lib/nih/nih.default.conf | 5 | lib/nih/nih.default.conf | |
6 | libexec/nih/analyse_conflicts | 6 | libexec/nih/analyse_conflicts | |
7 | libexec/nih/cmp2hr | 7 | libexec/nih/cmp2hr | |
8 | libexec/nih/pkg_create_fake | 8 | libexec/nih/pkg_create_fake | |
9 | man/man1/nih.1 | 9 | man/man1/nih.1 | |
10 | man/man1/pkg_update_plan.1 | 10 | man/man1/pkg_update_plan.1 | |
11 | share/doc/pkgnih/COPYRIGHT | 11 | share/doc/pkgnih/LICENSE | |
12 | share/doc/pkgnih/NEWS | 12 | share/doc/pkgnih/NEWS | |
13 | share/doc/pkgnih/README | 13 | share/doc/pkgnih/README | |
14 | share/doc/pkgnih/TODO | 14 | share/doc/pkgnih/TODO | |
15 | share/examples/nih/nih.conf | 15 | share/examples/nih/nih.conf |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2013/03/08 13:04:32 cheusov Exp $ | 1 | $NetBSD: distinfo,v 1.10 2014/01/14 01:16:28 cheusov Exp $ | |
2 | 2 | |||
3 | SHA1 (pkgnih-0.11.0.tar.gz) = 57ee38059d55e2568a1465c62df22bbddc55ba9a | 3 | SHA1 (pkgnih-0.12.0.tar.gz) = 960bccb2150603041b64103dcde53778c80798f1 | |
4 | RMD160 (pkgnih-0.11.0.tar.gz) = 7363f411571f1afa81ab1e91d9fb654b42b05e62 | 4 | RMD160 (pkgnih-0.12.0.tar.gz) = 99331f162ce11008e854df504157b6984c705c0a | |
5 | Size (pkgnih-0.11.0.tar.gz) = 36747 bytes | 5 | Size (pkgnih-0.12.0.tar.gz) = 49597 bytes |