Allow specifying multiple input files for 'pkgin import'.

Ok imil@, will be integrated upstream

4 files changed, 29 insertions, 11 deletions

diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index ef07b0ad7ea..3569b45fbaa 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2013/09/02 11:01:42 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.41 2013/10/06 08:28:47 wiz Exp $
 
 GHCOMMIT=		3859170568fbe4fe21b5660dbaeca8d65ac10f1b
 DISTNAME=		${GHCOMMIT}
 PKGNAME=		pkgin-0.6.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		pkgtools
 MASTER_SITES=		https://github.com/NetBSDfr/pkgin/archive/
 FETCH_USING=		curl
diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index 2db6fc67a31..085af2031ae 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2013/09/10 14:40:33 joerg Exp $
+$NetBSD: distinfo,v 1.31 2013/10/06 08:28:47 wiz Exp $
 
 SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c5320542c919afe0c7
 RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af
 Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes
-SHA1 (patch-actions.c) = 5ce6ac2051c0f9e7048926b3b5f41d8c17d98252
-SHA1 (patch-main.c) = 1566a310534ff7c9080fbf4c28d510a3c7102274
+SHA1 (patch-actions.c) = c7a630a2509ade9d913abb771a7bde4653a44e78
+SHA1 (patch-main.c) = 2faf9b225fdf30a997c5c0249cd40486d5d8d55c
diff --git a/pkgtools/pkgin/patches/patch-actions.c b/pkgtools/pkgin/patches/patch-actions.c
index 902fd410a14..d4d0a9b37cb 100644
--- a/pkgtools/pkgin/patches/patch-actions.c
+++ b/pkgtools/pkgin/patches/patch-actions.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-actions.c,v 1.1 2013/09/02 10:38:04 jperkin Exp $
+$NetBSD: patch-actions.c,v 1.2 2013/10/06 08:28:47 wiz Exp $
 
 No need to work-around 'pkg_add -f' bug any more.
 
---- actions.c.orig	2013-09-02 10:32:50.000000000 +0000
+--- actions.c.orig	2013-06-16 14:00:45.000000000 +0000
 +++ actions.c
 @@ -139,9 +139,6 @@ analyse_pkglog(long int filepos)
  		/* Warning: [...] was built for a platform */
diff --git a/pkgtools/pkgin/patches/patch-main.c b/pkgtools/pkgin/patches/patch-main.c
index 767edcdaf15..b4a009e519e 100644
--- a/pkgtools/pkgin/patches/patch-main.c
+++ b/pkgtools/pkgin/patches/patch-main.c
@@ -1,8 +1,27 @@
-$NetBSD: patch-main.c,v 1.1 2013/09/10 14:40:33 joerg Exp $
+$NetBSD: patch-main.c,v 1.2 2013/10/06 08:28:47 wiz Exp $
 
---- main.c.orig	2013-09-09 02:13:47.000000000 +0000
+--- main.c.orig	2013-06-16 14:00:45.000000000 +0000
 +++ main.c
-@@ -301,10 +301,9 @@ main(int argc, char *argv[])
+@@ -50,7 +50,7 @@ main(int argc, char *argv[])
+ {
+ 	uint8_t		updb_all;
+ 	uint8_t		do_inst = DO_INST; /* by default, do install packages */
+-	int 		ch, rc = EXIT_SUCCESS;
++	int 		ch, i, rc = EXIT_SUCCESS;
+ 	struct stat	sb;
+ 	const char	*chrootpath = NULL;
+ 
+@@ -244,7 +244,8 @@ main(int argc, char *argv[])
+ 		break;
+ 	case PKG_IMPORT_CMD: /* import for keep packages and install them */
+ 		missing_param(argc, 2, MSG_MISSING_FILENAME);
+-		import_keep(do_inst, argv[1]);
++		for (i=1; i<argc; i++)
++			import_keep(do_inst, argv[i]);
+ 		break;
+ 	case PKG_SHPROV_CMD: /* show what a package provides */
+ 		missing_param(argc, 2, MSG_MISSING_PKGNAME);
+@@ -301,10 +302,9 @@ main(int argc, char *argv[])
  static void
  missing_param(int argc, int nargs, const char *msg)
  {