Update pkg to 1.4.0

Update pkg-devel to 1.4.99.0 (aka 1.5 pre-alpha0)
Changes since pkg 1.3.0:
Changes you can expect in pkg 1.4 are the following:
- Loads of bug fixes
- Stricter checking of the path passed via the plist
- Removal of the bundled libyaml
- new --raw-format to chose the output format for info -R and search -R
- ABI (for freebsd, unchanged for dragonfly) is now follwing MACHINE_ARCH
  (freebsd:10:x86:64 become FreeBSD:10:amd64) the old ABI is available as a
  fallback in ALTABI
- pkg check now support a quiet mode
- new 3 way merge code ("stolen" from the fossil-scm) to allow automerging
configuration files
- new @config keyword to mark a file as a config file (during
  upgrade/reinstallation it will try to merge the configuration with the one the
  user may have modified) an option AUTOMERGE is available to prevent
  automerging if automerge fails a .pkgnew file will be created along with the
  untouched user version of the configuration
- The update procedure has been improved and speed up a lot (in particular for
  machine with low resources)
- The unique identifier has been modified to be pkgname meaning now ports can be
  moved in new categories without having to be considered a different package
- Only libraries starting by lib* are added to the provided libraries
- General speed up of all operations
- pkg set gain a -n option (equivalent to -o but works on name rather than origin)
- pkg set -o now considered deprecated
- pkg version accept '?' and '!' in pkg version limchar

7 files changed, 7 insertions, 81 deletions

diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 3f457edb322f..a75404d46b20 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.4.0.rc3
+DISTVERSION=	1.4.99.0
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index 5cbcba77f13d..e13ffe980d70 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.4.0.rc3.tar.xz) = c05b74d64662c0945cc6a8f9b6525dbdebf7afe9daa6408bcad7f93bc7c83ab4
-SIZE (pkg-1.4.0.rc3.tar.xz) = 1772412
+SHA256 (pkg-1.4.99.0.tar.xz) = bdc3cbaba90dfeacaea768a80a1975aad296d2ae4a00369d8e006b79a376b84c
+SIZE (pkg-1.4.99.0.tar.xz) = 1783368
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index b44ef20f695b..cb1d8202e1d3 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.3.8
-PORTREVISION=	3
+DISTVERSION=	1.4.0
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
-		LOCAL/portmgr \
 		http://files.etoilebsd.net/${PORTNAME}/ \
+		LOCAL/portmgr \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 
 MAINTAINER=	portmgr@FreeBSD.org
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 6bbd62f9fdc4..5f0f4c4970dd 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.3.8.tar.xz) = 06036f0bd0019d7a5b553272e665f060c44f6d8c1b61c5def67a5d9e24ead773
-SIZE (pkg-1.3.8.tar.xz) = 1786712
+SHA256 (pkg-1.4.0.tar.xz) = d65d8e16bce30db3397d8eb2979aad52bd770cc50a4afa55750f4b169a1f67da
+SIZE (pkg-1.4.0.tar.xz) = 1802924
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c
deleted file mode 100644
index d48a76bfad3d..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 67751707406b7da5ff85978f755d4e68bab3d38d
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Wed Sep 24 13:30:29 2014 -0500
-
-    Fix repo override crashing when URL is not defined.
-    
-    Only override URL if one is provided.
-    
-    Issue:	#1024
-
-diff --git libpkg/pkg_config.c libpkg/pkg_config.c
-index ec96883..83e2f5d 100644
---- libpkg/pkg_config.c
-+++ libpkg/pkg_config.c
-@@ -1065,9 +1065,11 @@ pkg_repo_overwrite(struct pkg_repo *r, const char *name, const char *url,
- {
- 
- 	free(r->name);
--	free(r->url);
- 	r->name = strdup(name);
--	r->url = strdup(url);
-+	if (url != NULL) {
-+		free(r->url);
-+		r->url = strdup(url);
-+	}
- 	r->ops = pkg_repo_find_type(type);
- 	HASH_DEL(repos, r);
- 	HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r);
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
deleted file mode 100644
index 9e13a9c28801..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c
-index 744ad4a..4308196 100644
---- libpkg/pkg_ports.c
-+++ libpkg/pkg_ports.c
-@@ -1056,7 +1056,8 @@ plist_new(struct pkg *pkg, const char *stage)
- 
- 	p->pkg = pkg;
- 	pkg_get(pkg, PKG_PREFIX, &prefix);
--	strlcpy(p->prefix, prefix, sizeof(p->prefix));
-+	if (prefix != NULL)
-+		strlcpy(p->prefix, prefix, sizeof(p->prefix));
- 	p->slash = p->prefix[strlen(p->prefix) - 1] == '/' ? "" : "/";
- 	p->stage = stage;
- 	p->uname = strdup("root");
diff --git a/ports-mgmt/pkg/files/patch-plist-non-fatal b/ports-mgmt/pkg/files/patch-plist-non-fatal
deleted file mode 100644
index 50edf9dcaacc..000000000000
--- a/ports-mgmt/pkg/files/patch-plist-non-fatal
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c
-index 33a29d0..21182b4 100644
---- libpkg/pkg_ports.c
-+++ libpkg/pkg_ports.c
-@@ -1141,7 +1141,7 @@ int
- ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
- {
- 	char *line = NULL;
--	int ret = EPKG_OK;
-+	int ret, rc = EPKG_OK;
- 	struct plist *pplist;
- 	FILE *plist_f;
- 	size_t linecap = 0;
-@@ -1162,6 +1162,8 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
- 		if (line[linelen - 1] == '\n')
- 			line[linelen - 1] = '\0';
- 		ret = plist_parse_line(pkg, pplist, line);
-+		if (rc == EPKG_OK)
-+			rc = ret;
- 	}
- 
- 	free(line);
-@@ -1185,7 +1187,7 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
- 
- 	plist_free(pplist);
- 
--	return (ret);
-+	return (rc);
- }
- 
- int