TIP#268 IMPLEMENTATION

	* generic/tclDecls.h:    Regenerated from tcl.decls.
	* generic/tclStubInit.c:

	* doc/PkgRequire.3: Documentation of extended API,
	* doc/package.n:    extended testsuite.
	* tests/pkg.test:

	* generic/tcl.decls: Implementation.
	* generic/tclBasic.c:
	* generic/tclConfig.c:
	* generic/tclInt.h:
	* generic/tclPkg.c:
	* generic/tclTest.c:
	* generic/tclTomMathInterface.c:
	* library/init.tcl:
	* library/package.tcl:
	* library/tm.tcl:

1 files changed, 4 insertions, 6 deletions

diff --git a/library/tm.tcl b/library/tm.tcl
index db1f361..b877cbb 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -189,7 +189,7 @@ proc ::tcl::tm::list {} {
 #	May populate the package ifneeded database with additional
 #	provide scripts.
 
-proc ::tcl::tm::UnknownHandler {original name version {exact {}}} {
+proc ::tcl::tm::UnknownHandler {original name args} {
     # Import the list of paths to search for packages in module form.
     # Import the pattern used to check package names in detail.  
 
@@ -263,10 +263,8 @@ proc ::tcl::tm::UnknownHandler {original name version {exact {}}} {
 		    # processing.
 
 		    if {
-			$pkgname eq $name && (
-			($exact eq "-exact" && ![package vcompare $pkgversion $version]) ||
-			($version ne "" && [package vsatisfies $pkgversion $version]) ||
-			($version eq ""))
+			($pkgname eq $name) &&
+			[package vsatisfies $pkgversion {expand}$args]
 		    } then {
 			set satisfied 1
 			# We do not abort the loop, and keep adding
@@ -287,7 +285,7 @@ proc ::tcl::tm::UnknownHandler {original name version {exact {}}} {
     # about ::list...
 
     if {[llength $original]} {
-	uplevel 1 $original [::list $name $version $exact]
+	uplevel 1 $original [::linsert $args 0 $name]
     }
 }