Fix regex, which fixes portmaster/portupgrade integration

Reported by:	kwm

3 files changed, 31 insertions, 1 deletions

diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 752bb6ebd483..c908c57f0cdc 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.3.0.b3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
 		http://files.etoilebsd.net/pkg/ \
diff --git a/ports-mgmt/pkg-devel/files/patch-libpkg__pkgdb.c b/ports-mgmt/pkg-devel/files/patch-fix-rdeps
index 00f8ca557388..00f8ca557388 100644
--- a/ports-mgmt/pkg-devel/files/patch-libpkg__pkgdb.c
+++ b/ports-mgmt/pkg-devel/files/patch-fix-rdeps
diff --git a/ports-mgmt/pkg-devel/files/patch-fix-regex b/ports-mgmt/pkg-devel/files/patch-fix-regex
new file mode 100644
index 000000000000..232238507b01
--- /dev/null
+++ b/ports-mgmt/pkg-devel/files/patch-fix-regex
@@ -0,0 +1,30 @@
+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 {