Index: tclconfig/tcl.m4
===================================================================
RCS file: /cvsroot/tix/tix/tclconfig/tcl.m4,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 tcl.m4
--- tclconfig/tcl.m4	25 Mar 2005 20:15:53 -0000	1.3
+++ tclconfig/tcl.m4	4 Jun 2005 10:37:57 -0000
@@ -2092,6 +2092,9 @@ AC_DEFUN(TEA_PATH_X, [
 	    *MAC_OSX_TK*)
 		AC_DEFINE(MAC_OSX_TK)
 		TEA_WINDOWINGSYSTEM="aqua"
+                if test -z "${ac_cv_c_tkh}" -o ! -r "${ac_cv_c_tkh}/X11/Xlib.h"; then
+                    TK_XINCLUDES='-I${TK_SRC_DIR}/xlib'
+                fi
 		;;
 	    *)
 		TEA_PATH_UNIX_X
Index: unix/pkgIndex.tcl
===================================================================
RCS file: unix/pkgIndex.tcl
diff -N unix/pkgIndex.tcl
--- unix/pkgIndex.tcl	3 Nov 2000 02:12:41 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-#
-#	$Id: pkgIndex.tcl,v 1.2 2000/11/03 02:12:41 idiscovery Exp $
-#
-# Tcl package index file, version 1.0
-
-package ifneeded Tix 8.1.8.0 [list load "[file join [file dirname $dir] libtix8.1.8.0.so]" Tix]
-
-package ifneeded Tix 8.1.8.1 [list load "[file join [file dirname $dir] libtix8.1.8.1.so]" Tix]
-
-package ifneeded Tix 8.1.8.2 [list load "[file join [file dirname $dir] libtix8.1.8.2.so]" Tix]
-
-package ifneeded Tix 8.1.8.3 [list load "[file join [file dirname $dir] libtix8.1.8.3.so]" Tix]
-
Index: win/pkgIndex.tcl
===================================================================
RCS file: win/pkgIndex.tcl
diff -N win/pkgIndex.tcl
--- win/pkgIndex.tcl	3 Nov 2000 01:55:58 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-#
-#	$Id: pkgIndex.tcl,v 1.2 2000/11/03 01:55:58 idiscovery Exp $
-#
-# Tcl package index file, version 1.0
-
-package ifneeded Tix 8.1.8.0 \
-    [list load "[file join [file dirname $dir] tix8180.dll]" Tix]
-
-package ifneeded Tix 8.1.8.1 \
-    [list load "[file join [file dirname $dir] tix8181.dll]" Tix]
-
-package ifneeded Tix 8.1.8.2 \
-    [list load "[file join [file dirname $dir] tix8182.dll]" Tix]
-
-package ifneeded Tix 8.1.8.3 \
-    [list load "[file join [file dirname $dir] tix8183.dll]" Tix]
-