4 files changed, 5 insertions, 99 deletions

diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index a47fbfcf1543..939943bb80dc 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,14 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.3.0.b3
-PORTREVISION=	2
+DISTVERSION=	1.3.0.b4
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
-		http://files.etoilebsd.net/pkg/ \
-		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
-		http://miwibox.org/distfiles/${PORTNAME}/ \
-		LOCAL/portmgr
+		http://highsecure.ru/distfiles/ \
+		http://pkg.semmy.ru/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkg@FreeBSD.org
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index c5be15590e3a..3f20a8ccb371 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.3.0.b3.tar.xz) = be64e2209365e47fe95ab4b3558c767696b08c32d74ed0ca27b99fc5d6f56f60
-SIZE (pkg-1.3.0.b3.tar.xz) = 1715624
+SHA256 (pkg-1.3.0.b4.tar.xz) = d81ec87cdfa9c3f811daea834b59453c9fc69bff8ff54036ab631c2e12b1d1d3
+SIZE (pkg-1.3.0.b4.tar.xz) = 1691540
diff --git a/ports-mgmt/pkg-devel/files/patch-fix-rdeps b/ports-mgmt/pkg-devel/files/patch-fix-rdeps
deleted file mode 100644
index 00f8ca557388..000000000000
--- a/ports-mgmt/pkg-devel/files/patch-fix-rdeps
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 4f3ce011ee1d0f00afc8d84ed9fd82cda9f02a08
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Wed Jun 11 12:31:21 2014 -0500
-
-    Fix pkgdb_load_rdeps by reverting "Avoid deps full scan when loading dependencies."
-    
-    This reverts commit cf47e2c24af23c8f278d9c502fe2923a42f23d33.
-    
-    1. deps should be joined on p.id=d.package_id rather than origin.
-       Otherwise no results are returned breaking pkg-query %r, pkg-autoremove,
-       etc.
-    2. Restore uniqueid support [1]
-    
-    Discussed with:	bapt [1]
-    
-    Fixes #833
-
-diff --git libpkg/pkgdb.c libpkg/pkgdb.c
-index e46ddeb..7e4500b 100644
---- libpkg/pkgdb.c
-+++ libpkg/pkgdb.c
-@@ -1923,23 +1923,19 @@ pkgdb_load_rdeps(struct pkgdb *db, struct pkg *pkg)
- {
- 	sqlite3_stmt	*stmt = NULL;
- 	int		 ret;
--	const char	*origin;
-+	const char	*uniqueid;
- 	const char	*reponame = NULL;
- 	char		 sql[BUFSIZ];
- 	const char	*mainsql = ""
- 		"SELECT p.name, p.origin, p.version, p.locked "
--		"FROM main.deps AS d "
--		"LEFT JOIN main.packages AS p ON p.origin = d.origin "
-+		"FROM main.packages AS p, main.deps AS d "
- 		"WHERE p.id = d.package_id "
--		"AND p.name = d.name "
--		"AND d.origin = ?1;";
-+			"AND d.name || '~' || d.origin = ?1;";
- 	const char	*reposql = ""
- 		"SELECT p.name, p.origin, p.version, 0 "
--		"FROM %Q.deps AS d "
--		"LEFT JOIN %Q.packages AS p ON p.origin = d.origin "
-+		"FROM %Q.packages AS p, %Q.deps AS d "
- 		"WHERE p.id = d.package_id "
--		"AND p.name = d.name "
--		"AND d.origin = ?1;";
-+			"AND d.name || '~' || d.origin = ?1;";
- 
- 	assert(db != NULL && pkg != NULL);
- 
-@@ -1962,8 +1958,8 @@ pkgdb_load_rdeps(struct pkgdb *db, struct pkg *pkg)
- 		return (EPKG_FATAL);
- 	}
- 
--	pkg_get(pkg, PKG_ORIGIN, &origin);
--	sqlite3_bind_text(stmt, 1, origin, -1, SQLITE_STATIC);
-+	pkg_get(pkg, PKG_UNIQUEID, &uniqueid);
-+	sqlite3_bind_text(stmt, 1, uniqueid, -1, SQLITE_STATIC);
- 
- 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
- 		pkg_addrdep(pkg, sqlite3_column_text(stmt, 0),
diff --git a/ports-mgmt/pkg-devel/files/patch-fix-regex b/ports-mgmt/pkg-devel/files/patch-fix-regex
deleted file mode 100644
index 232238507b01..000000000000
--- a/ports-mgmt/pkg-devel/files/patch-fix-regex
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 8ccfa88c4bb211ebe421eb4beaa826fa03a1548b
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Thu Jun 12 15:10:53 2014 -0500
-
-    pkgdb_get_pattern_query: Fix regex handling when '-' used by not using SPLIT_VERSION
-    
-      Error:
-        # pkg info -x 'pkg(-devel)?$'
-        pkg: sqlite error while executing iterator in file pkgdb.c:1548: Invalid regex
-    
-      Expected:
-        # pkg info -x 'pkg(-devel)?$'
-        pkg-devel-1.3.0.b2
-    
-    Partial revert from fa815ff62
-
-diff --git libpkg/pkgdb.c libpkg/pkgdb.c
-index 008bb84..9e38631 100644
---- libpkg/pkgdb.c
-+++ libpkg/pkgdb.c
-@@ -1651,8 +1651,7 @@ pkgdb_get_pattern_query(const char *pattern, match_t match)
- 		if (checkuid == NULL) {
- 			if (checkorigin == NULL)
- 				comp = " WHERE name REGEXP ?1 "
--					"OR (name REGEXP SPLIT_VERSION('name', ?1) AND "
--					" version REGEXP SPLIT_VERSION('version', ?1))";
-+				    "OR name || '-' || version REGEXP ?1";
- 			else
- 				comp = " WHERE origin REGEXP ?1";
- 		} else {