- update to 1.0-beta15

- changes:
  - new -d to pkg fetch to download the dependencies along with the package
  - fix automatic flag tracking over installs and upgrades
  - fix hardlink detection (size calculation of git is now sane again :))
  - pkg remove is now an alias to pkg delete
  - fix a bug with shlibs track causing segfault
  - pkg check -r now updates flatesiz and checksums
  - all generated yaml now contain a yaml object separator, pkg info -Ra can be
    pased directly to a yaml parser
  - pkg query and pkg rquery do not fallback anymore on matching everything if
    -g -x or -X is passed in arguments
  - fix python packing on pointyhat/tinderbox with a ugly workaround for now
  - pkg info '' and pkg search '' now complains about empty pattern
  - pkg rquery now return 1 if nothing matched

3 files changed, 3 insertions, 42 deletions

diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index b087bb30fc47..11a576e7ed59 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pkg
-DISTVERSION=	1.0-beta14
-PORTREVISION=	1
+DISTVERSION=	1.0-beta15
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 601191cef9c5..bacec8a348a4 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.0-beta14.tar.xz) = 0bcae748908becee6c71c6f6240d6605a837959cd44b6bc7704d33be503d13a1
-SIZE (pkg-1.0-beta14.tar.xz) = 1326844
+SHA256 (pkg-1.0-beta15.tar.xz) = c95d205355566ad3214e5c57d90581737b1a1774414e3399d64ce4b2ee7ffa5e
+SIZE (pkg-1.0-beta15.tar.xz) = 1327304
diff --git a/ports-mgmt/pkg/files/patch-pkg__update.c b/ports-mgmt/pkg/files/patch-pkg__update.c
deleted file mode 100644
index 2c0ae1741cb0..000000000000
--- a/ports-mgmt/pkg/files/patch-pkg__update.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./pkg/update.c.orig	2012-05-22 14:26:11.000000000 +0200
-+++ ./pkg/update.c	2012-05-22 18:44:42.324768000 +0200
-@@ -45,7 +45,6 @@
-  */
- int
- pkgcli_update(void) {
--	char url[MAXPATHLEN];
- 	const char *packagesite = NULL;
- 	const char *repo_name;
- 	bool multi_repos = false;
-@@ -70,12 +69,7 @@
- 			return (1);
- 		}
- 
--		if (packagesite[strlen(packagesite) - 1] == '/')
--			snprintf(url, MAXPATHLEN, "%srepo.txz", packagesite);
--		else
--			snprintf(url, MAXPATHLEN, "%s/repo.txz", packagesite);
--
--		retcode = pkg_update("repo", url);
-+		retcode = pkg_update("repo", packagesite);
- 		if (retcode == EPKG_UPTODATE) {
- 			if (!quiet)
- 				printf("Remote repository up-to-date, no need to upgrade\n");
-@@ -87,12 +81,7 @@
- 			repo_name = pkg_config_kv_get(repokv, PKG_CONFIG_KV_KEY);
- 			packagesite = pkg_config_kv_get(repokv, PKG_CONFIG_KV_VALUE);
- 
--			if (packagesite[strlen(packagesite) - 1] == '/')
--				snprintf(url, MAXPATHLEN, "%srepo.txz", packagesite);
--			else
--				snprintf(url, MAXPATHLEN, "%s/repo.txz", packagesite);
--
--			retcode = pkg_update(repo_name, url);
-+			retcode = pkg_update(repo_name, packagesite);
- 			if (retcode == EPKG_UPTODATE) {
- 				if (!quiet)
- 					printf("%s repository up-to-date, no need to upgrade\n", repo_name);