--- tclxml-3.0b2-orig/library/pkgIndex.tcl.in	2003-12-03 22:06:34 +0200
+++ tclxml-3.0b2/library/pkgIndex.tcl.in	2004-05-13 01:07:49 +0300
@@ -2,41 +2,21 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.13 2003/12/03 20:06:34 balls Exp $
 
-package ifneeded xml::c       @VERSION@ [list load   [file join $dir @Tclxml_LIB_FILE@]]
+package ifneeded xml::c       @VERSION@ [list load   [file join $dir .. .. .. lib tcl @Tclxml_LIB_FILE@]]
 package ifneeded xml::tcl     @VERSION@ [list source [file join $dir xml__tcl.tcl]]
 package ifneeded sgmlparser   1.1       [list source [file join $dir sgmlparser.tcl]]
 package ifneeded xpath        1.0       [list source [file join $dir xpath.tcl]]
 package ifneeded xmldep       1.0       [list source [file join $dir xmldep.tcl]]
 
-# The C parsers are provided through their own packages and indices,
-# and thus do not have to be listed here. This index may require them
-# in certain places, but does not provide them. This is part of the
-# work refactoring the build system of TclXML to create clean
-# packages, and not require a jumble (jungle?) of things in one Makefile.
-#
-#package ifneeded xml::expat  @VERSION@ [list load   [file join $dir @expat_TCL_LIB_FILE@]]
-#package ifneeded xml::xerces 2.0       [list load   [file join $dir @xerces_TCL_LIB_FILE@]]
-#package ifneeded xml::libxml2 @VERSION@ [list load   [file join $dir @TclXML_libxml2_LIB_FILE@]]
-
 namespace eval ::xml {}
 
 # Requesting a specific package means we want it to be the default parser class.
 # This is achieved by loading it last.
 
-# expat and libxml2 packages must have xml::c package loaded
-package ifneeded expat @VERSION@ {
-    package require xml::c @VERSION@
-    package require xmldefs
-    package require xml::tclparser @VERSION@
-    catch {package require xml::libxml2 @VERSION@}
-    package require xml::expat     @VERSION@
-    package provide expat          @VERSION@
-}
 package ifneeded libxml2 @VERSION@ {
     package require xml::c @VERSION@
     package require xmldefs
     package require xml::tclparser @VERSION@
-    catch {package require xml::expat @VERSION@}
     package require xml::libxml2   @VERSION@
     package provide libxml2        @VERSION@
 }
@@ -50,7 +30,6 @@
 	package require xml::tclparser @VERSION@
     } else {
 	package require xmldefs
-	catch {package require xml::expat   @VERSION@}
 	catch {package require xml::libxml2 @VERSION@}
 	package require xml::tclparser
     }
@@ -77,20 +56,11 @@
 	package require xmldefs
 	package require xml::tclparser    @VERSION@
 	# libxml2 is favoured since it provides more features
-	catch {package require xml::expat @VERSION@}
 	catch {package require xml::libxml2 @VERSION@}
     }
     package provide xml @VERSION@
 }
 
-if {[info tclversion] <= 8.0} {
-    package ifneeded sgml           1.9       [list source [file join $dir sgml-8.0.tcl]]
-    package ifneeded xmldefs        @VERSION@ [list source [file join $dir xml-8.0.tcl]]
-    package ifneeded xml::tclparser @VERSION@ [list source [file join $dir tclparser-8.0.tcl]]
-} else {
-    package ifneeded sgml           1.9       [list source [file join $dir sgml-8.1.tcl]]
-    package ifneeded xmldefs        @VERSION@ [list source [file join $dir xml-8.1.tcl]]
-    package ifneeded xml::tclparser @VERSION@ [list source [file join $dir tclparser-8.1.tcl]]
-}
-
-
+package ifneeded sgml           1.9       [list source [file join $dir sgml-8.1.tcl]]
+package ifneeded xmldefs        @VERSION@ [list source [file join $dir xml-8.1.tcl]]
+package ifneeded xml::tclparser @VERSION@ [list source [file join $dir tclparser-8.1.tcl]]