summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorcheusov <cheusov@pkgsrc.org>2013-03-08 13:04:32 +0000
committercheusov <cheusov@pkgsrc.org>2013-03-08 13:04:32 +0000
commit329f26fde93c98743d426ec5f54f50a6cfecf527 (patch)
tree74834cf438042aa65f9bf03cbab9fc3185bd5f77 /pkgtools
parentc5fa7313c8337af52221a17326de1fbc5ed63591 (diff)
downloadpkgsrc-329f26fde93c98743d426ec5f54f50a6cfecf527.tar.gz
Version 0.11.0, by Aleksey Cheusov, Fri, 8 Mar 2013 15:56:56 +0300
nih install: - Order of packages does matter ("nih install emacs- editors/emacs22" is correct) - Option -P and new config variable NO_REQPROV_CHECK were added - Option -L and new config variable NO_REMOVE_LEAVES were added - "Nothing to be done" message is output if everything is up-to-date - Download failures and cksum failures are handled differently - Handling CONFLICTS between installed packages and packages to install are handled differently. Now package splits and similar problems are resolved with a help of "fake" packages. Fake packages are always marked for updates. New option -f for "nih list" was added in order to list them - Improvemed download progress messages nih uninstall: - Option -L was added, see "nih install -L" - Options -p and -P were added. See "nih install" nih leaf: - Command was reimplemented and simplified - Option -t option was removed pkg_status doesn't have -ltRn options anymore - Option -r was added nih search: - Option -I uses pkg_digger_installed provided by pkg_summary-utils pkg_update_plan: - Fixes in error messages nih search|meta|info: - Option -p was added. With a help of it one may search in pkgsrc packages offline. Also see "nih refresh -p" and man page Now nih works correctly if REPOSITORY is a directory Fixes for shell's "trap" command.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/nih/Makefile17
-rw-r--r--pkgtools/nih/PLIST4
-rw-r--r--pkgtools/nih/distinfo8
3 files changed, 18 insertions, 11 deletions
diff --git a/pkgtools/nih/Makefile b/pkgtools/nih/Makefile
index 345dd99dbe5..7bb96260ad8 100644
--- a/pkgtools/nih/Makefile
+++ b/pkgtools/nih/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2012/09/11 23:19:35 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/03/08 13:04:32 cheusov Exp $
-DISTNAME= pkgnih-0.10.1
-PKGREVISION= 1
+DISTNAME= pkgnih-0.11.0
PKGNAME= ${DISTNAME:S/pkgnih/nih/}
CATEGORIES= pkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/ \
@@ -12,7 +11,7 @@ HOMEPAGE= https://github.com/cheusov/pkgnih
COMMENT= Package manager for pkgsrc
LICENSE= 2-clause-bsd
-DEPENDS+= pkg_summary-utils>=0.58.4:../../pkgtools/pkg_summary-utils
+DEPENDS+= pkg_summary-utils>=0.60.0:../../pkgtools/pkg_summary-utils
DEPENDS+= digest-[0-9]*:../../pkgtools/digest
DEPENDS+= pkg_install>=20100915:../../pkgtools/pkg_install
@@ -34,7 +33,14 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/nih
REPLACE_INTERPRETER+= runawk
REPLACE.runawk.old= .*runawk
REPLACE.runawk.new= ${PREFIX}/bin/runawk
-REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in
+REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in \
+ nih/pkg_create_fake.in nih/analyse_conflicts.in
+
+MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV+= PACKAGES=${PACKAGES}
+MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR}
+MAKE_ENV+= REAL_ROOT_USER=${REAL_ROOT_USER}
+MAKE_ENV+= REAL_ROOT_GROUP=${REAL_ROOT_GROUP}
.include "../../mk/bsd.prefs.mk"
@@ -53,5 +59,4 @@ REPLACE_SH+= nih/nih.in nih/pkg_status.in
.endif
.include "../../devel/mk-configure/mk-c.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/nih/PLIST b/pkgtools/nih/PLIST
index eaf2e2d17ce..e9474290122 100644
--- a/pkgtools/nih/PLIST
+++ b/pkgtools/nih/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2011/09/09 22:02:19 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/03/08 13:04:32 cheusov Exp $
bin/nih
bin/pkg_status
bin/pkg_update_plan
lib/nih/nih.default.conf
+libexec/nih/analyse_conflicts
libexec/nih/cmp2hr
+libexec/nih/pkg_create_fake
man/man1/nih.1
man/man1/pkg_update_plan.1
share/doc/pkgnih/COPYRIGHT
diff --git a/pkgtools/nih/distinfo b/pkgtools/nih/distinfo
index c93ded17a1a..21a9f203564 100644
--- a/pkgtools/nih/distinfo
+++ b/pkgtools/nih/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/08/26 16:13:32 cheusov Exp $
+$NetBSD: distinfo,v 1.9 2013/03/08 13:04:32 cheusov Exp $
-SHA1 (pkgnih-0.10.1.tar.gz) = 8e2366b3b6a545a5a8f0df587af003da6acdf085
-RMD160 (pkgnih-0.10.1.tar.gz) = 65aa2cda43183d6bfe7ec7b83a287d036def429e
-Size (pkgnih-0.10.1.tar.gz) = 56644 bytes
+SHA1 (pkgnih-0.11.0.tar.gz) = 57ee38059d55e2568a1465c62df22bbddc55ba9a
+RMD160 (pkgnih-0.11.0.tar.gz) = 7363f411571f1afa81ab1e91d9fb654b42b05e62
+Size (pkgnih-0.11.0.tar.gz) = 36747 bytes