[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-usbin/files/

[Aaron Bauman]

commit:     5b6bc9bca6ecec6d9b28bbd804c52e683c449cc6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 12:03:30 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:09:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6bc9bc

sys-freebsd/freebsd-usbin: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/8611

 .../files/freebsd-usbin-9.1-bsdxml2expat.patch     | 12 ---------
 .../files/freebsd-usbin-9.1-kldxref.patch          | 30 ----------------------
 2 files changed, 42 deletions(-)

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
deleted file mode 100644
index bddc0c77f21..00000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
---- work.orig/usr.sbin/ctladm/ctladm.c	2012-07-12 13:25:58.000000000 +0900
-+++ work/usr.sbin/ctladm/ctladm.c	2012-07-16 05:37:14.000000000 +0900
-@@ -60,7 +60,7 @@
- #include <errno.h>
- #include <err.h>
- #include <ctype.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <cam/scsi/scsi_all.h>
- #include <cam/scsi/scsi_message.h>
- #include <cam/ctl/ctl.h>

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
deleted file mode 100644
index 95bd665ded6..00000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: usr.sbin/kldxref/kldxref.c
-===================================================================
---- usr.sbin/kldxref/kldxref.c	(revision 265111)
-+++ usr.sbin/kldxref/kldxref.c	(working copy)
-@@ -274,6 +274,16 @@ usage(void)
- 	exit(1);
- }
- 
-+static int
-+compare(const FTSENT *const *a, const FTSENT *const *b)
-+{
-+	if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D)
-+		return 1;
-+	if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D)
-+		return -1;
-+	return strcmp((*a)->fts_name, (*b)->fts_name);
-+}
-+
- int
- main(int argc, char *argv[])
- {
-@@ -315,7 +325,7 @@ main(int argc, char *argv[])
- 		err(1, "%s", argv[0]);
- 	}
- 
--	ftsp = fts_open(argv, fts_options, 0);
-+	ftsp = fts_open(argv, fts_options, compare);
- 	if (ftsp == NULL)
- 		exit(1);
-