removed patches, integrated upstream

3 files changed, 0 insertions, 63 deletions

diff --git a/pkgtools/pkgin/patches/patch-Makefile.in b/pkgtools/pkgin/patches/patch-Makefile.in
deleted file mode 100644
index 3d3364b1bb1..00000000000
--- a/pkgtools/pkgin/patches/patch-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.3 2014/01/21 16:31:27 jperkin Exp $
-
-Support catpage.
-
---- Makefile.in.orig	2013-06-16 14:00:45.000000000 +0000
-+++ Makefile.in
-@@ -2,4 +2,5 @@
- 
- PROG=		pkgin
-+MAN=		pkgin.1
- VERSION=	@PACKAGE_VERSION@
- SRCS=		main.c summary.c tools.c pkgindb.c depends.c actions.c \
diff --git a/pkgtools/pkgin/patches/patch-actions.c b/pkgtools/pkgin/patches/patch-actions.c
deleted file mode 100644
index d4d0a9b37cb..00000000000
--- a/pkgtools/pkgin/patches/patch-actions.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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-06-16 14:00:45.000000000 +0000
-+++ actions.c
-@@ -139,9 +139,6 @@ analyse_pkglog(long int filepos)
- 		/* Warning: [...] was built for a platform */
- 		if (strstr(err_line, "Warning") != NULL)
- 			warn_count++;
--		/* A different version [...] is already installed */
--		if (strstr(err_line, "already installed") != NULL)
--			err_count--;
- 		/* 1 package addition failed */
- 		if (strstr(err_line, "addition failed") != NULL)
- 			err_count++;
diff --git a/pkgtools/pkgin/patches/patch-main.c b/pkgtools/pkgin/patches/patch-main.c
deleted file mode 100644
index b4a009e519e..00000000000
--- a/pkgtools/pkgin/patches/patch-main.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-main.c,v 1.2 2013/10/06 08:28:47 wiz Exp $
-
---- main.c.orig	2013-06-16 14:00:45.000000000 +0000
-+++ main.c
-@@ -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)
- {
--	const char *foo = msg;
- 
- 	if (argc < nargs)
--		errx(EXIT_FAILURE, foo);
-+		errx(EXIT_FAILURE, "%s", msg);
- }
- 
- /* find command index */