Update to 1.1.0.b2

- Fix pkg audit -F [1]
- Fix the new solver trying to downgrade some packages when it shouldn't
- Properly show how much space is going to be free/required when deinstalling [2]

Reported by:	Nikolai Lifanov <lifanov@mail.lifanov.com> [1], gerald [2]

3 files changed, 3 insertions, 52 deletions

diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 6469584b23ff..c4f3497b343a 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.1.0.b1
-PORTREVISION=	1
+DISTVERSION=	1.1.0.b2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://files.etoilebsd.net/pkg/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index 16fc7bab8060..2895490df2af 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.1.0.b1.tar.xz) = bb851be8bb778b21f8e91271b15834c7dc0089e9973c8afe1dd62ae04a81f2f6
-SIZE (pkg-1.1.0.b1.tar.xz) = 1549412
+SHA256 (pkg-1.1.0.b2.tar.xz) = df6a5d042daa073e33b3bda1c843e3a6dfe9367badbf3996f29e2190d4e48e5b
+SIZE (pkg-1.1.0.b2.tar.xz) = 1549240
diff --git a/ports-mgmt/pkg-devel/files/patch-audit b/ports-mgmt/pkg-devel/files/patch-audit
deleted file mode 100644
index b202d8a61ada..000000000000
--- a/ports-mgmt/pkg-devel/files/patch-audit
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git libpkg/fetch.c libpkg/fetch.c
-index 88979da..5dd3a94 100644
---- libpkg/fetch.c
-+++ libpkg/fetch.c
-@@ -250,7 +250,7 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t
- 	doc = u->doc;
- 	while (remote == NULL) {
- 		if (retry == max_retry) {
--			if (repo->mirror_type == SRV &&
-+			if (repo != NULL && repo->mirror_type == SRV &&
- 			    (strncmp(u->scheme, "http", 4) == 0
- 			     || strcmp(u->scheme, "ftp") == 0)) {
- 				snprintf(zone, sizeof(zone),
-@@ -258,7 +258,7 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t
- 				if (repo->srv == NULL)
- 					repo->srv = dns_getsrvinfo(zone);
- 				srv_current = repo->srv;
--			} else if (repo->mirror_type == HTTP &&
-+			} else if (repo != NULL && repo->mirror_type == HTTP &&
- 			           strncmp(u->scheme, "http", 4) == 0) {
- 				snprintf(zone, sizeof(zone),
- 				    "%s://%s", u->scheme, u->host);
-@@ -268,9 +268,9 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t
- 			}
- 		}
- 
--		if (repo->mirror_type == SRV && repo->srv != NULL)
-+		if (repo != NULL && repo->mirror_type == SRV && repo->srv != NULL)
- 			strlcpy(u->host, srv_current->host, sizeof(u->host));
--		else if (repo->mirror_type == HTTP && repo->http != NULL) {
-+		else if (repo != NULL && repo->mirror_type == HTTP && repo->http != NULL) {
- 			strlcpy(u->scheme, http_current->url->scheme, sizeof(u->scheme));
- 			strlcpy(u->host, http_current->url->host, sizeof(u->host));
- 			snprintf(docpath, MAXPATHLEN, "%s%s", http_current->url->doc, doc);
-@@ -291,11 +291,11 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t
- 				retcode = EPKG_FATAL;
- 				goto cleanup;
- 			}
--			if (repo->mirror_type == SRV && repo->srv != NULL) {
-+			if (repo != NULL && repo->mirror_type == SRV && repo->srv != NULL) {
- 				srv_current = srv_current->next;
- 				if (srv_current == NULL)
- 					srv_current = repo->srv;
--			} else if (repo->mirror_type == HTTP && repo->http != NULL) {
-+			} else if (repo != NULL && repo->mirror_type == HTTP && repo->http != NULL) {
- 				http_current = repo->http->next;
- 				if (http_current == NULL)
- 					http_current = repo->http;