--- configure.orig	2008-03-14 02:35:16 +0300
+++ configure	2008-03-14 02:41:05 +0300
@@ -1332,13 +1332,7 @@
   tcl_version=''
   tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
   for tk_incs in \
-    "-I/usr/local/include" \
-    "-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" \
-    "-I/usr/include/tcl8.4 -I/usr/include/tk8.4" \
-    "-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" \
-    "-I/usr/include/tcl8.3 -I/usr/include/tk8.3" \
-    "-I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2" \
-    "-I/usr/include/tcl8.2 -I/usr/include/tk8.2" \
+    "-I/usr/include/tcl -I/usr/include/tk" \
     "-I/sw/include" \
     "-I/usr/pkg/include"
   do if test -z "$tcl_version"; then
@@ -1355,6 +1349,7 @@
     8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
+    8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
     *) echo "This version is not known."; has_tk=false ;;
     esac
   else
--- otherlibs/labltk/support/cltkImg.c.orig	2008-03-14 03:25:51 +0300
+++ otherlibs/labltk/support/cltkImg.c	2008-03-14 03:26:34 +0300
@@ -98,7 +98,11 @@
   pib.offset[0] = 0;
   pib.offset[1] = 1;
   pib.offset[2] = 2;
-  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
+  Tk_PhotoPutBlock(
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
+	cltclinterp,
+#endif
+	ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
 #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
                    , TK_PHOTO_COMPOSITE_SET
 #endif
--- otherlibs/labltk/tkanim/tkAnimGIF.c.orig	2008-03-14 03:25:58 +0300
+++ otherlibs/labltk/tkanim/tkAnimGIF.c	2008-03-14 03:26:19 +0300
@@ -334,7 +334,11 @@
                 goto error;
             }
         }
-        Tk_PhotoPutBlock(photoHandle, &block, 0, 0, imageWidth, imageHeight
+        Tk_PhotoPutBlock(
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
+	interp,
+#endif
+	photoHandle, &block, 0, 0, imageWidth, imageHeight
 #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
                    , TK_PHOTO_COMPOSITE_SET
 #endif