- match package version numbers with relational operators

- use glob patterns when matching packages by origin

- csh-style {...} choices in glob matching

- pkg_info: new flag -E (list matching package names only)

- pkg_version: new flag -T (test if a given name matches a pattern)

- new flag -X (interpret pattern as an extended regular expression)

PR:		56961

3 files changed, 17 insertions, 5 deletions

diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index dcac1d6..c75d73a 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
 #include "lib.h"
 #include "delete.h"
 
-static char Options[] = "adDfGhinp:rvx";
+static char Options[] = "adDfGhinp:rvxX";
 
 char	*Prefix		= NULL;
 Boolean	CleanDirs	= FALSE;
@@ -88,6 +88,10 @@ main(int argc, char **argv)
 	    MatchType = MATCH_REGEX;
 	    break;
 
+	case 'X':
+	    MatchType = MATCH_EREGEX;
+	    break;
+
 	case 'i':
 	    Interactive = TRUE;
 	    break;
@@ -151,7 +155,7 @@ static void
 usage()
 {
     fprintf(stderr, "%s\n%s\n",
-	"usage: pkg_delete [-dDfGinrvx] [-p prefix] pkg-name ...",
+	"usage: pkg_delete [-dDfGinrvxX] [-p prefix] pkg-name ...",
 	"       pkg_delete -a [flags]");
     exit(1);
 }
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index dce1260..c1bc803 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -64,6 +64,7 @@ pkg_perform(char **pkgs)
 	    case MATCH_ALL:
 		warnx("no packages installed");
 		return 0;
+	    case MATCH_EREGEX:
 	    case MATCH_REGEX:
 		warnx("no packages match pattern(s)");
 		return 1;
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index fbcf752..9c7cc86 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -17,7 +17,7 @@
 .\"     @(#)pkg_delete.1
 .\" $FreeBSD$
 .\"
-.Dd November 25, 1994
+.Dd June 29, 2004
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
@@ -25,7 +25,7 @@
 .Nd a utility for deleting previously installed software package distributions
 .Sh SYNOPSIS
 .Nm
-.Op Fl dDfGinrvx
+.Op Fl dDfGinrvxX
 .Op Fl p Ar prefix
 .Ar pkg-name ...
 .Nm
@@ -119,6 +119,12 @@ provided, in that case
 .Nm
 deletes all packages that match at least one
 regular expression from the list.
+.It Fl X
+Like
+.Fl x ,
+but treats the
+.Ar pkg-name
+as an extended regular expression.
 .It Fl r
 Recursive removal.  In addition to specified packages, delete all
 packages that depend on those packages as well.
@@ -271,6 +277,7 @@ Default location of the installed package database.
 .Sh AUTHORS
 .An Jordan Hubbard
 .Sh CONTRIBUTORS
-.An John Kohl Aq jtk@rational.com
+.An John Kohl Aq jtk@rational.com ,
+.An Oliver Eikemeier Aq eik@FreeBSD.org
 .Sh BUGS
 Sure to be some.