dev-tcltk/tkimg: Drop old, #497702

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

8 files changed, 24 insertions, 1025 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index b0b8039a89a4..78ab981d07ed 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.65 2014/03/05 15:45:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.66 2014/03/06 09:38:34 jlec Exp $
+
+  06 Mar 2014; Justin Lecher <jlec@gentoo.org> -tkimg-1.4-r7.ebuild,
+  -files/tkimg-1.4-jbig.patch, -files/tkimg-1.4-libtiff.patch,
+  -files/tkimg-1.4-libtiff4.patch, -files/tkimg-1.4-zlib-1.2.6.patch,
+  -files/tkimg-1.4-zlib127-gzgetc_fix.patch:
+  Drop old, #497702
 
   05 Mar 2014; Agostino Sarubbo <ago@gentoo.org> tkimg-1.4-r9.ebuild:
   Stable for ppc, wrt bug #497706
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index c0a9236ec423..33fdeb884d09 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,33 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX tkimg-1.4-jbig.patch 910 SHA256 7ee39eb27556b3e990ff2514065a8a8c4b1e128aa1d7e2e61afb19d1e2384714 SHA512 fae1bb3d8524ebd47ca37e417b04327138308af83aa82269c5ff74f795e3a0b2334a84e66b84c80831708e95dce99f1cc295f0d755f07cad154d2c2f1520d33b WHIRLPOOL 0fda5415a005d2d219df950af1b2e36d8d64f0b5672b617964227ae11d561a9cb58ea894fb99303b525e33ee259312abaad58529af50e97a643852cc3e4b627c
-AUX tkimg-1.4-libtiff.patch 5069 SHA256 07c4f995aea0f135107a331b8df434b3af7ec934c108ace8367e61d9889c0f16 SHA512 123f3fed7121290164eefda5122cbe2705a642ca6826d96ea6be3cbc134d8ce5ed6adcb0a335599312a80fb8bf8b8d0dd35ec9f812fc25607ae489040b938e7e WHIRLPOOL e99ac303511968d2073ce247b7e0eaf3961410bd60b78d57199e7e27169186d2950179e4c092c6924f0c26cd55a054f1a153d542544a8c14fb70c47a56011f3b
-AUX tkimg-1.4-libtiff4.patch 33987 SHA256 f6441799ad59afc12011b0ded8f1d2f6e45f7a6316a83a4114438041a400090f SHA512 8b0e50bb1d440e95e2b5a4d9044a165bcafd0140287fbbabf589ff3514d27f06803e99f2ed38756a780206a01c7dc2e7aa3442500b0a2a75754155014fa93875 WHIRLPOOL ccd9cba9b4dbfb2afa902ec2de86c791e484e39ea281f28afad03c69cd106b8e379e0714e6960347b1851ac13209a2c794baa79faa41f09ae3195ad51fe91f09
 AUX tkimg-1.4-png2.patch 1044 SHA256 be9ab3c3cd82b65fd0ed2d3e30398ee671d19c78aa60e6464aac11caa56660ea SHA512 fbf982af5446fc54212745eee8338d5dc4b169f79045963be23a84c7a0ef9e68f54d895156b4f040f6585499f1ead9967ac0ce57106e3ca3615fbaa9adcd1fb7 WHIRLPOOL d918cde7bc6fc1364f8d86b709f8366a65506104b70a5a9901afd5c89f5d23dc6a0bc4606a4d1fb97bc5e49ee6eb3ce6c019031c09bbe558d278248454bed143
-AUX tkimg-1.4-zlib-1.2.6.patch 496 SHA256 4abf9ccffb9ddc186211b9955d52d566ecf6d9d7c3e11324dab18a86ac1dcc2d SHA512 d9b698da5abfbd5b2a921200a139e1d01244a8d983f0801e76d77ebcba15ba224707fe4290317b2fd06e0b597a254fbb2a97943c0220cd3e6fe9786f30bc4a8f WHIRLPOOL 4440cb147f9eeb0139b82d1d66e1404608b7b6ef1f9ab193eb8f5d9c6b7e74731942bb8a1a1f05bdeb82aae6b18d30fe3b2bfd12adbeb5bc6fc7ad317e1fa957
-AUX tkimg-1.4-zlib127-gzgetc_fix.patch 1518 SHA256 d44338b06f10da1f52a960e97bac6663f87dc852e20bccb1ece652fb7b430b82 SHA512 080add14d7e1edc5e0a6884a7aa9e8442c12156842c629e5a9393dcc3150a74d2a21293302fcf777a46fcc2e1f8ed3ba9e558eddd2caf35d3437112daf90bb42 WHIRLPOOL b0c9bda7f48ddeb7d36324b051d8bc11834942cdaf7e064365a61ae1ebfca901c76227cad4705788041371e2dccb7a9842c82dec4d337613e180e7cd8a3d7b38
-DIST tkimg-1.4-gentoo+bundled-tiff.patch.xz 10960 SHA256 b95d57d02ef144d50565c482edcec97533683e433d845ea50f830c1359d60457 SHA512 77155964f7b11b8f0d5d20f36fa48c90b6b3b2e1bf261933b14c4f58306ca6c92d126ddbcaadcc55c72435f690431ef93ba9bef1a4975380f6dc019e50d8103a WHIRLPOOL 926d94c1e7ff344cb354d596bbf367f4d70b00f9341d40c6cbc2f9aa4940d4cf3bb975f9f32f7b75a789095d76076e19fa347f6a6c4c930dc00d4bdf3dc36532
 DIST tkimg-1.4-patchset-1.tar.xz 17956 SHA256 b1eb9db771928ea71edb17852b23c6b760c112e3c776be51502b4f8b2cbd75f4 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69 WHIRLPOOL 39099d752c4e6ccd96640c1287c218fff261a98e04455b9e8cba5c2aa308186916bc3583e4941c87f73323b3e46731ba2ed86358c10ab85cb6b913931585a778
 DIST tkimg1.4.tar.bz2 4912894 SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1 SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1 WHIRLPOOL 0ace52c074389c09de240922c95a40ff4b1ab01d5bc060fca168396abad11a845326d15e582b039da6062c1b2780cee572299d21902947edd90195d4b99e6089
-EBUILD tkimg-1.4-r7.ebuild 2008 SHA256 83019aa3bf39d03d4de3466ac93db872c448741a2e432b25370e54e58083b15d SHA512 2d794213d0aed43adfbf2040bf2cea768d65153248228e2f4e187db831193b8ba178a3cb1900e0ed534d10266c7c201c34a16582d21e8b3c19952a1ba6c478b7 WHIRLPOOL 68763ceded736ed3c05c7d4ac878791b13b558fa59fa3184cc84df2bf4291ce85067f41cd985727d2da511411072f926ad410093e02d8ee4ee3cf8dda59e6900
 EBUILD tkimg-1.4-r9.ebuild 1927 SHA256 40e5e665d42a3cd96ba2246c11737ee4320b70cfddc290d5075ac15f9aa7614b SHA512 7bfe540e5b28eff90498504a831d5a12e3c943223f9bd77d1b70e56b2f9d2a51f3bae4984da08b164b3df4168fab30b50f74bb27550a7b007e0e59b98996f2a6 WHIRLPOOL 641ad10b5cb82943718dbfaa07d72ec6b3b0f1eb9fd5229ce0716c839c7fa8e43902298a86a3e4fa2f890cf7c97f10d6fe309f5fc86389ffa8d7d4c20cdda5d5
-MISC ChangeLog 10598 SHA256 e7a25cf1a44ea12b8fa682403d07b501ad2b259bfae94140c4a298f9e1569216 SHA512 01beddcaae5924aed2ef044cb9507d324f003843de7eb89cb64fba8de2d5febc6a27a8b6fc4ba1286d5d7d75819eb1bdda97a5873e1d66dd5636ab4bf5eb1166 WHIRLPOOL cb30b5fa0b98f294103798a84416270e46423a3b846b8a2c33596b44d517693738dee70fc9e19e8919f8625c3837c2b354f12cc13d7c3aceaf2e0b0ad94cc616
+MISC ChangeLog 10867 SHA256 ddb435b6b8a102fa0ebc2f27e32260ce04b12050a169d5602f424f8ce1f9d204 SHA512 58eab46063a88855ce80cd6a4aceafbbc260b38dfdad0734696d7f7eb08100a43a21115588eb19f779bc30a0a718cdd0a6c7b7fc9a222b581793d3c3384b9a7d WHIRLPOOL ad7e77e355c622a55738100f8b7a1dd79a7997fc8f0aad2f7071ecb0633d5b95d0df877b2c7ff3cd6b614de1817a8a3960a1c49388241bf52aa5a90a68dc9033
 MISC metadata.xml 268 SHA256 46e93319147e9bd7c28fd2b86953f51adf3b5614cadce70b4e8ffec42a6065f0 SHA512 82c879c78438886cd731e62bd1e04202c9400c8b4fc68f348ad97f0c32591ad4c55e1e721c8ca51bb25b6561cb0739c3003dcc09abff6fb6c2e32a32a1dec857 WHIRLPOOL 5bc269fe4fa4ead158d84c1c4aa1f114799aa143df31d394beae6f57c23a780fd48f61ca3dfe059c0c6971b7a076afd67abb2af37f1213913e3d517fe1c69561
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTF0aVAAoJELp701BxlEWfTakP/2GGqvWU2ML6cBikXyK8w7By
-QoxfTbgv47XTV7WlZbKAuap4Q2ZsdJ9O9b8UiLZ6a45VJuQQW0+Uo6KnKgsz1dmh
-D0sHntbTAjTYHE5T4lA7JVcZ9989AcUOHi3eeT2iYnDJOpcQWgRWlz3ZRvdCadac
-iahk9/xjdSbtYXDjajpUxcYIkQ+187T+OeC4uYHOQ+zv6cEVqUTJKfHvKWrij0sZ
-T67GyWfhmfTJabukogMuTBnef/RAg1Ug7T/IaI3DoMJHePuHum3ySNYWFv4Ckl39
-UacVUmUAFY73iTdYGTc8427knC0ynzBD7RVce5+f844hXbyQIbd1K+sFEEmPe827
-pbRpUj8Pd2Eo08NTDwYeAPkKWFqKDDkmg/WjeI0lETWxjiLVuhW0vIxZIXVmHr1n
-RWy5oR/ZZvgOQdyCNNQ72iliSkNM7mC1VSuwbiT0Qo88qHhTrZAkZ+847duVhpjv
-iuaPZPBBmQFB32LesoFC6rKErzcKAtSqiQ8RCtZnc3StxFWud7jCs7WPzf6S7hda
-JkvEUbyM97dHLipEXWXkBPrf9XkfXeAS/MLEoLgRbuZV9y7ZZSUwfiRJ0vc6RXpi
-v8CP89doeEGAVhB/g37k3KalDTXzGFFUlq9xBoya6wDVJp5e38L726Xxn4Cx0H2p
-uOjt3mPn5/x1mN7jf9QP
-=Gd7Q
+iQJ8BAEBCgBmBQJTGEIUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViruDQQAIbJYCgplAsrRqfPJWgZ1/Ih
+HqUTDDN43wG3r3G76iYT9IwcJ1g1ARMPSATc/0ChOTQ2IXyuSQ9MegDfVMRQiuhv
+6PzmnWmpwtyiA3t68elNTLvpMkFfI6d7tqDFfTj10kPCQ5IYHsS6V99yt6DwJI6o
+r2mPK8v7rAeNHEyCGBM1rLVCuWNIGm17TyJEAReftSXWAWNRuvMihv6CVd/sx3BD
+iH47KJfdtIBGzy8OUa5LPpmEXPGl2DfoLhkRfD3BWFYB/7v/0YaEwsNLfyTDzCH4
+BqTyD7ZycnXVneC2W7+lxaDNiWOlckGphqnjCuC3DzWGFcOHxgAaWSNCH+Vt0N9Z
+77WYpxwN5Wz6MNWurmC8e8tqCM6CMJ2WBgmP81nZ6Rx0R+g5MhOm8CRaw6pLPcDJ
+h6gcEd4Ync7Ws+YB+oGh32kTEjnSBlvwquFxEwzLBx4MHgS7d3Jw5H/Z3XdtoXad
+975n2uRCnRLIZK3KOYlk5qmiJfKvcCft4hhxr1Y9wLOTGON1xdV2bJ0qTvILrUAD
+24FhkW3vNgp2TAEB8I0/+ieyNLPBQFNBanMA+oXLFRXaUAnUnT0pDIiz2+x86vgF
+yEYsrRYaGzxrgN4ShaASKm+1kQLnhNOG4l51z+oDKjZj+5uGgx0q6x0dIULEJJWQ
+qxIF7OF/SZKVwANbGskA
+=qf9R
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch
deleted file mode 100644
index 4f7ebc42e0f6..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tkimg1.4/libtiff/configure.in	2010-07-06 15:48:46.000000000 +0200
-+++ tkimg1.4/libtiff/configure.in	2011-02-28 23:24:18.471259943 +0100
-@@ -67,7 +67,7 @@
- else
-     TIFFHOST="$host"
- fi
--${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
-+${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
- 	"--with-CC=$TIFFCC" $TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
---- tkimg1.4/libtiff/configure	2010-07-07 10:09:46.000000000 +0200
-+++ tkimg1.4/libtiff/configure	2011-02-28 23:25:53.529824614 +0100
-@@ -5133,7 +5133,7 @@
- else
-     TIFFHOST="$host"
- fi
--${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
-+${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
- 	"--with-CC=$TIFFCC" $TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-libtiff.patch b/dev-tcltk/tkimg/files/tkimg-1.4-libtiff.patch
deleted file mode 100644
index 0d0ad6083f42..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-libtiff.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -up tkimg1.4/libtiff/configure.libtiff tkimg1.4/libtiff/configure
---- tkimg1.4/libtiff/configure.libtiff	2010-07-07 04:09:46.000000000 -0400
-+++ tkimg1.4/libtiff/configure	2011-08-01 15:49:04.039079729 -0400
-@@ -5183,17 +5183,6 @@ mv -f tifftcl_confdefs.h confdefs.h
- 
- 
-     vars="
--	../compat/libtiff/libtiff/tif_aux.c		../compat/libtiff/libtiff/tif_close.c		../compat/libtiff/libtiff/tif_codec.c
--	../compat/libtiff/libtiff/tif_compress.c	../compat/libtiff/libtiff/tif_dir.c		../compat/libtiff/libtiff/tif_dirinfo.c
--	../compat/libtiff/libtiff/tif_dirread.c	../compat/libtiff/libtiff/tif_dirwrite.c	../compat/libtiff/libtiff/tif_dumpmode.c
--	../compat/libtiff/libtiff/tif_error.c		../compat/libtiff/libtiff/tif_fax3.c
--	../compat/libtiff/libtiff/tif_getimage.c	../compat/libtiff/libtiff/tif_flush.c		../compat/libtiff/libtiff/tif_luv.c
--	../compat/libtiff/libtiff/tif_lzw.c		../compat/libtiff/libtiff/tif_next.c		../compat/libtiff/libtiff/tif_open.c
--	../compat/libtiff/libtiff/tif_packbits.c	../compat/libtiff/libtiff/tif_predict.c	../compat/libtiff/libtiff/tif_print.c
--	../compat/libtiff/libtiff/tif_read.c		../compat/libtiff/libtiff/tif_swab.c		../compat/libtiff/libtiff/tif_strip.c
--	../compat/libtiff/libtiff/tif_thunder.c	../compat/libtiff/libtiff/tif_tile.c		../compat/libtiff/libtiff/tif_version.c
--	../compat/libtiff/libtiff/tif_warning.c	../compat/libtiff/libtiff/tif_write.c
--	../compat/libtiff/libtiff/tif_color.c		../compat/libtiff/libtiff/tif_extension.c
- "
-     for i in $vars; do
- 	case $i in
-@@ -5574,7 +5563,7 @@ if test "${TEA_PLATFORM}" = "windows" ; 
- else
-     CLEANFILES=""
- 
--    vars="../compat/libtiff/libtiff/tif_unix.c"
-+    vars=""
-     for i in $vars; do
- 	case $i in
- 	    \$*)
-@@ -6053,7 +6042,7 @@ $as_echo "$tcl_cv_cc_visibility_hidden" 
-     if test $tcl_cv_cc_visibility_hidden = yes; then :
- 
- 
--$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
-+$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
- 
- 
- fi
-diff -up tkimg1.4/libtiff/Makefile.in.libtiff tkimg1.4/libtiff/Makefile.in
---- tkimg1.4/libtiff/Makefile.in.libtiff	2010-07-07 07:08:08.000000000 -0400
-+++ tkimg1.4/libtiff/Makefile.in	2011-08-01 15:49:04.040079716 -0400
-@@ -35,8 +35,8 @@
- 
- # tif_fax3sm is special. It is generated.
- 
--PKG_SOURCES	= @PKG_SOURCES@ tif_fax3sm.c
--PKG_OBJECTS	= @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
-+PKG_SOURCES	= @PKG_SOURCES@
-+PKG_OBJECTS	= @PKG_OBJECTS@
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -109,7 +109,7 @@ RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ltiff
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff -up tkimg1.4/libtiff/tifftclDecls.h.libtiff tkimg1.4/libtiff/tifftclDecls.h
---- tkimg1.4/libtiff/tifftclDecls.h.libtiff	2010-07-07 07:08:08.000000000 -0400
-+++ tkimg1.4/libtiff/tifftclDecls.h	2011-08-01 15:49:04.041079703 -0400
-@@ -34,9 +34,13 @@ EXTERN int Tifftcl_SafeInit(Tcl_Interp *
-  */
- #undef INLINE
- 
--#include "../compat/libtiff/libtiff/tiffio.h"
--#include "../compat/libtiff/libtiff/tiffiop.h"
--#include "../compat/libtiff/libtiff/tif_predict.h"
-+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h>
-+
-+/*
-+ * Typedefs for ``method pointers'' used internally.
-+ */
-+typedef unsigned char tidataval_t;	/* internal image data value type */
-+typedef tidataval_t* tidata_t;          /* reference to internal image data */
- 
- /* !BEGIN!: Do not edit below this line. */
- 
-diff -up tkimg1.4/tiff/configure.libtiff tkimg1.4/tiff/configure
---- tkimg1.4/tiff/configure.libtiff	2010-07-13 11:44:38.000000000 -0400
-+++ tkimg1.4/tiff/configure	2011-08-01 15:49:04.044079664 -0400
-@@ -5753,7 +5753,7 @@ fi
- #-----------------------------------------------------------------------
- 
- 
--    vars="tiff.c tiffJpeg.c tiffZip.c tiffPixar.c"
-+    vars="tiff.c"
-     for i in $vars; do
- 	case $i in
- 	    \$*)
-diff -up tkimg1.4/tiff/tiff.c.libtiff tkimg1.4/tiff/tiff.c
---- tkimg1.4/tiff/tiff.c.libtiff	2010-07-08 06:41:55.000000000 -0400
-+++ tkimg1.4/tiff/tiff.c	2011-08-01 15:51:27.451272526 -0400
-@@ -124,14 +124,14 @@ SetupTiffLibrary (interp)
- 	  if (Zlibtcl_InitStubs(interp, ZLIBTCL_VERSION, 0) == NULL) {
- 	    return TCL_ERROR;
- 	  }
--	  TIFFRegisterCODEC (COMPRESSION_DEFLATE,  "Deflate",  TkimgTIFFInitZip);
--	  TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TkimgTIFFInitZip);
-+	  TIFFRegisterCODEC (COMPRESSION_DEFLATE,  "Deflate", TIFFInitZIP);
-+	  TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TIFFInitZIP);
- 
- 	  if (Jpegtcl_InitStubs(interp, JPEGTCL_VERSION, 0) == NULL) {
- 	    return TCL_ERROR;
- 	  }
--	  TIFFRegisterCODEC (COMPRESSION_JPEG,     "JPEG",     TkimgTIFFInitJpeg);
--	  TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TkimgTIFFInitPixar);
-+	  TIFFRegisterCODEC (COMPRESSION_JPEG,     "JPEG",     TIFFInitJPEG);
-+	  TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TIFFInitPixarLog);
- 	}
-     }
-     return TCL_OK;
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-libtiff4.patch b/dev-tcltk/tkimg/files/tkimg-1.4-libtiff4.patch
deleted file mode 100644
index 8553554e4be1..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-libtiff4.patch
+++ /dev/null
@@ -1,720 +0,0 @@
-diff -up tkimg1.4/libtiff/tifftclDecls.h.tiff4 tkimg1.4/libtiff/tifftclDecls.h
---- tkimg1.4/libtiff/tifftclDecls.h.tiff4	2012-05-07 10:55:28.696144380 -0400
-+++ tkimg1.4/libtiff/tifftclDecls.h	2012-05-07 10:55:28.720144199 -0400
-@@ -58,18 +58,18 @@ TIFFTCLAPI TIFFCodec *	TIFFRegisterCODEC
- /* 3 */
- TIFFTCLAPI void		TIFFUnRegisterCODEC(TIFFCodec *a);
- /* 4 */
--TIFFTCLAPI tdata_t	_TIFFmalloc(tsize_t a);
-+TIFFTCLAPI tdata_t	_TIFFmalloc(tmsize_t a);
- /* 5 */
--TIFFTCLAPI tdata_t	_TIFFrealloc(tdata_t a, tsize_t b);
-+TIFFTCLAPI tdata_t	_TIFFrealloc(void *a, tmsize_t b);
- /* 6 */
--TIFFTCLAPI void		_TIFFmemset(tdata_t a, int b, tsize_t c);
-+TIFFTCLAPI void		_TIFFmemset(void *a, int b, tmsize_t c);
- /* 7 */
--TIFFTCLAPI void		_TIFFmemcpy(tdata_t a, const tdata_t b, tsize_t c);
-+TIFFTCLAPI void		_TIFFmemcpy(void *a, const void *b, tmsize_t c);
- /* 8 */
--TIFFTCLAPI int		_TIFFmemcmp(const tdata_t a, const tdata_t b,
--				tsize_t c);
-+TIFFTCLAPI int		_TIFFmemcmp(const void *a, const void *b,
-+				tmsize_t c);
- /* 9 */
--TIFFTCLAPI void		_TIFFfree(tdata_t a);
-+TIFFTCLAPI void		_TIFFfree(void *a);
- /* 10 */
- TIFFTCLAPI void		TIFFClose(TIFF *tiffptr);
- /* 11 */
-@@ -77,30 +77,30 @@ TIFFTCLAPI int		TIFFFlush(TIFF *tiffptr)
- /* 12 */
- TIFFTCLAPI int		TIFFFlushData(TIFF *tiffptr);
- /* 13 */
--TIFFTCLAPI int		TIFFGetField(TIFF *tiffptr, ttag_t a, ...);
-+TIFFTCLAPI int		TIFFGetField(TIFF *tiffptr, uint32 a, ...);
- /* 14 */
--TIFFTCLAPI int		TIFFVGetField(TIFF *tiffptr, ttag_t a, va_list b);
-+TIFFTCLAPI int		TIFFVGetField(TIFF *tiffptr, uint32 a, va_list b);
- /* 15 */
--TIFFTCLAPI int		TIFFGetFieldDefaulted(TIFF *tiffptr, ttag_t a, ...);
-+TIFFTCLAPI int		TIFFGetFieldDefaulted(TIFF *tiffptr, uint32 a, ...);
- /* 16 */
--TIFFTCLAPI int		TIFFVGetFieldDefaulted(TIFF *tiffptr, ttag_t a,
-+TIFFTCLAPI int		TIFFVGetFieldDefaulted(TIFF *tiffptr, uint32 a,
- 				va_list b);
- /* 17 */
- TIFFTCLAPI int		TIFFReadDirectory(TIFF *tiffptr);
- /* 18 */
--TIFFTCLAPI tsize_t	TIFFScanlineSize(TIFF *tiffptr);
-+TIFFTCLAPI tmsize_t	TIFFScanlineSize(TIFF *tiffptr);
- /* 19 */
--TIFFTCLAPI tsize_t	TIFFRasterScanlineSize(TIFF *tiffptr);
-+TIFFTCLAPI tmsize_t	TIFFRasterScanlineSize(TIFF *tiffptr);
- /* 20 */
--TIFFTCLAPI tsize_t	TIFFStripSize(TIFF *tiffptr);
-+TIFFTCLAPI tmsize_t	TIFFStripSize(TIFF *tiffptr);
- /* 21 */
--TIFFTCLAPI tsize_t	TIFFVStripSize(TIFF *tiffptr, uint32 a);
-+TIFFTCLAPI tmsize_t	TIFFVStripSize(TIFF *tiffptr, uint32 a);
- /* 22 */
--TIFFTCLAPI tsize_t	TIFFTileRowSize(TIFF *tiffptr);
-+TIFFTCLAPI tmsize_t	TIFFTileRowSize(TIFF *tiffptr);
- /* 23 */
--TIFFTCLAPI tsize_t	TIFFTileSize(TIFF *tiffptr);
-+TIFFTCLAPI tmsize_t	TIFFTileSize(TIFF *tiffptr);
- /* 24 */
--TIFFTCLAPI tsize_t	TIFFVTileSize(TIFF *tiffptr, uint32 a);
-+TIFFTCLAPI tmsize_t	TIFFVTileSize(TIFF *tiffptr, uint32 a);
- /* 25 */
- TIFFTCLAPI uint32	TIFFDefaultStripSize(TIFF *tiffptr, uint32 a);
- /* 26 */
-@@ -121,21 +121,21 @@ TIFFTCLAPI int		TIFFIsMSB2LSB(TIFF *tiff
- /* 33 */
- TIFFTCLAPI uint32	TIFFCurrentRow(TIFF *tiffptr);
- /* 34 */
--TIFFTCLAPI tdir_t	TIFFCurrentDirectory(TIFF *tiffptr);
-+TIFFTCLAPI uint16	TIFFCurrentDirectory(TIFF *tiffptr);
- /* 35 */
--TIFFTCLAPI tdir_t	TIFFNumberOfDirectories(TIFF *tiffptr);
-+TIFFTCLAPI uint16	TIFFNumberOfDirectories(TIFF *tiffptr);
- /* 36 */
--TIFFTCLAPI uint32	TIFFCurrentDirOffset(TIFF *tiffptr);
-+TIFFTCLAPI uint64	TIFFCurrentDirOffset(TIFF *tiffptr);
- /* 37 */
--TIFFTCLAPI tstrip_t	TIFFCurrentStrip(TIFF *tiffptr);
-+TIFFTCLAPI uint32	TIFFCurrentStrip(TIFF *tiffptr);
- /* 38 */
--TIFFTCLAPI ttile_t	TIFFCurrentTile(TIFF *tiffptr);
-+TIFFTCLAPI uint32	TIFFCurrentTile(TIFF *tiffptr);
- /* 39 */
--TIFFTCLAPI int		TIFFReadBufferSetup(TIFF *tiffptr, tdata_t a,
--				tsize_t b);
-+TIFFTCLAPI int		TIFFReadBufferSetup(TIFF *tiffptr, void *a,
-+				tmsize_t b);
- /* 40 */
--TIFFTCLAPI int		TIFFWriteBufferSetup(TIFF *tiffptr, tdata_t a,
--				tsize_t b);
-+TIFFTCLAPI int		TIFFWriteBufferSetup(TIFF *tiffptr, void *a,
-+				tmsize_t b);
- /* 41 */
- TIFFTCLAPI int		TIFFWriteCheck(TIFF *tiffptr, int a, const char *b);
- /* 42 */
-@@ -143,33 +143,31 @@ TIFFTCLAPI int		TIFFCreateDirectory(TIFF
- /* 43 */
- TIFFTCLAPI int		TIFFLastDirectory(TIFF *tiffptr);
- /* 44 */
--TIFFTCLAPI int		TIFFSetDirectory(TIFF *tiffptr, tdir_t a);
-+TIFFTCLAPI int		TIFFSetDirectory(TIFF *tiffptr, uint16 a);
- /* 45 */
--TIFFTCLAPI int		TIFFSetSubDirectory(TIFF *tiffptr, uint32 a);
-+TIFFTCLAPI int		TIFFSetSubDirectory(TIFF *tiffptr, uint64 a);
- /* 46 */
--TIFFTCLAPI int		TIFFUnlinkDirectory(TIFF *tiffptr, tdir_t a);
-+TIFFTCLAPI int		TIFFUnlinkDirectory(TIFF *tiffptr, uint16 a);
- /* 47 */
--TIFFTCLAPI int		TIFFSetField(TIFF *tiffptr, ttag_t a, ...);
-+TIFFTCLAPI int		TIFFSetField(TIFF *tiffptr, uint32 a, ...);
- /* 48 */
--TIFFTCLAPI int		TIFFVSetField(TIFF *tiffptr, ttag_t a, va_list b);
-+TIFFTCLAPI int		TIFFVSetField(TIFF *tiffptr, uint32 a, va_list b);
- /* 49 */
- TIFFTCLAPI int		TIFFWriteDirectory(TIFF *tiffptr);
- /* 50 */
--TIFFTCLAPI int		TIFFReassignTagToIgnore(enum TIFFIgnoreSense a,
--				int b);
- /* 51 */
- TIFFTCLAPI void		TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b);
- /* 52 */
--TIFFTCLAPI int		TIFFReadScanline(TIFF *tiffptr, tdata_t a, uint32 b,
--				tsample_t c);
-+TIFFTCLAPI int		TIFFReadScanline(TIFF *tiffptr, void *a, uint32 b,
-+				uint16 c);
- /* 53 */
--TIFFTCLAPI int		TIFFWriteScanline(TIFF *tiffptr, tdata_t a, uint32 b,
--				tsample_t c);
-+TIFFTCLAPI int		TIFFWriteScanline(TIFF *tiffptr, void *a, uint32 b,
-+				uint16 c);
- /* 54 */
- TIFFTCLAPI int		TIFFReadRGBAImage(TIFF *tiffptr, uint32 a, uint32 b,
- 				uint32 *c, int d);
- /* 55 */
--TIFFTCLAPI int		TIFFReadRGBAStrip(TIFF *tiffptr, tstrip_t a,
-+TIFFTCLAPI int		TIFFReadRGBAStrip(TIFF *tiffptr, uint32 a,
- 				uint32 *b);
- /* 56 */
- TIFFTCLAPI int		TIFFReadRGBATile(TIFF *tiffptr, uint32 a, uint32 b,
-@@ -207,48 +205,48 @@ TIFFTCLAPI TIFFErrorHandler TIFFSetWarni
- /* 69 */
- TIFFTCLAPI TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc a);
- /* 70 */
--TIFFTCLAPI ttile_t	TIFFComputeTile(TIFF *tiffptr, uint32 a, uint32 b,
--				uint32 c, tsample_t d);
-+TIFFTCLAPI uint32	TIFFComputeTile(TIFF *tiffptr, uint32 a, uint32 b,
-+				uint32 c, uint16 d);
- /* 71 */
- TIFFTCLAPI int		TIFFCheckTile(TIFF *tiffptr, uint32 d, uint32 c,
--				uint32 b, tsample_t a);
-+				uint32 b, uint16 a);
- /* 72 */
--TIFFTCLAPI ttile_t	TIFFNumberOfTiles(TIFF *tiffptr);
-+TIFFTCLAPI uint32	TIFFNumberOfTiles(TIFF *tiffptr);
- /* 73 */
--TIFFTCLAPI tsize_t	TIFFReadTile(TIFF *tiffptr, tdata_t a, uint32 b,
--				uint32 c, uint32 d, tsample_t e);
-+TIFFTCLAPI tmsize_t	TIFFReadTile(TIFF *tiffptr, void *a, uint32 b,
-+				uint32 c, uint32 d, uint16 e);
- /* 74 */
--TIFFTCLAPI tsize_t	TIFFWriteTile(TIFF *tiffptr, tdata_t e, uint32 d,
--				uint32 c, uint32 b, tsample_t a);
-+TIFFTCLAPI tmsize_t	TIFFWriteTile(TIFF *tiffptr, void *e, uint32 d,
-+				uint32 c, uint32 b, uint16 a);
- /* 75 */
--TIFFTCLAPI tstrip_t	TIFFComputeStrip(TIFF *tiffptr, uint32 a,
--				tsample_t b);
-+TIFFTCLAPI uint32	TIFFComputeStrip(TIFF *tiffptr, uint32 a,
-+				uint16 b);
- /* 76 */
--TIFFTCLAPI tstrip_t	TIFFNumberOfStrips(TIFF *tiffptr);
-+TIFFTCLAPI uint32	TIFFNumberOfStrips(TIFF *tiffptr);
- /* 77 */
--TIFFTCLAPI tsize_t	TIFFReadEncodedStrip(TIFF *tiffptr, tstrip_t a,
--				tdata_t b, tsize_t c);
-+TIFFTCLAPI tmsize_t	TIFFReadEncodedStrip(TIFF *tiffptr, uint32 a,
-+				void *b, tmsize_t c);
- /* 78 */
--TIFFTCLAPI tsize_t	TIFFReadRawStrip(TIFF *tiffptr, tstrip_t a,
--				tdata_t b, tsize_t c);
-+TIFFTCLAPI tmsize_t	TIFFReadRawStrip(TIFF *tiffptr, uint32 a,
-+				void *b, tmsize_t c);
- /* 79 */
--TIFFTCLAPI tsize_t	TIFFReadEncodedTile(TIFF *tiffptr, ttile_t a,
--				tdata_t b, tsize_t c);
-+TIFFTCLAPI tmsize_t	TIFFReadEncodedTile(TIFF *tiffptr, uint32 a,
-+				void *b, tmsize_t c);
- /* 80 */
--TIFFTCLAPI tsize_t	TIFFReadRawTile(TIFF *tiffptr, ttile_t c, tdata_t b,
--				tsize_t a);
-+TIFFTCLAPI tmsize_t	TIFFReadRawTile(TIFF *tiffptr, uint32 c, void *b,
-+				tmsize_t a);
- /* 81 */
--TIFFTCLAPI tsize_t	TIFFWriteEncodedStrip(TIFF *tiffptr, tstrip_t a,
--				tdata_t b, tsize_t c);
-+TIFFTCLAPI tmsize_t	TIFFWriteEncodedStrip(TIFF *tiffptr, uint32 a,
-+				void *b, tmsize_t c);
- /* 82 */
--TIFFTCLAPI tsize_t	TIFFWriteRawStrip(TIFF *tiffptr, tstrip_t a,
--				tdata_t b, tsize_t c);
-+TIFFTCLAPI tmsize_t	TIFFWriteRawStrip(TIFF *tiffptr, uint32 a,
-+				void *b, tmsize_t c);
- /* 83 */
--TIFFTCLAPI tsize_t	TIFFWriteEncodedTile(TIFF *tiffptr, ttile_t a,
--				tdata_t b, tsize_t c);
-+TIFFTCLAPI tmsize_t	TIFFWriteEncodedTile(TIFF *tiffptr, uint32 a,
-+				void *b, tmsize_t c);
- /* 84 */
--TIFFTCLAPI tsize_t	TIFFWriteRawTile(TIFF *tiffptr, ttile_t c, tdata_t b,
--				tsize_t a);
-+TIFFTCLAPI tmsize_t	TIFFWriteRawTile(TIFF *tiffptr, uint32 c, void *b,
-+				tmsize_t a);
- /* 85 */
- TIFFTCLAPI void		TIFFSetWriteOffset(TIFF *tiffptr, toff_t a);
- /* 86 */
-@@ -258,13 +256,13 @@ TIFFTCLAPI void		TIFFSwabLong(uint32 *a)
- /* 88 */
- TIFFTCLAPI void		TIFFSwabDouble(double *a);
- /* 89 */
--TIFFTCLAPI void		TIFFSwabArrayOfShort(uint16 *a, unsigned long b);
-+TIFFTCLAPI void		TIFFSwabArrayOfShort(uint16 *a, tmsize_t b);
- /* 90 */
--TIFFTCLAPI void		TIFFSwabArrayOfLong(uint32 *b, unsigned long a);
-+TIFFTCLAPI void		TIFFSwabArrayOfLong(uint32 *b, tmsize_t a);
- /* 91 */
--TIFFTCLAPI void		TIFFSwabArrayOfDouble(double *a, unsigned long b);
-+TIFFTCLAPI void		TIFFSwabArrayOfDouble(double *a, tmsize_t b);
- /* 92 */
--TIFFTCLAPI void		TIFFReverseBits(unsigned char *a, unsigned long b);
-+TIFFTCLAPI void		TIFFReverseBits(uint8 *a, tmsize_t b);
- /* 93 */
- TIFFTCLAPI const unsigned char * TIFFGetBitRevTable(int a);
- /* Slot 94 is reserved */
-@@ -273,8 +271,6 @@ TIFFTCLAPI const unsigned char * TIFFGet
- /* Slot 97 is reserved */
- /* Slot 98 is reserved */
- /* Slot 99 is reserved */
--/* 100 */
--TIFFTCLAPI int		TIFFPredictorInit(TIFF *tiffptr);
- /* Slot 101 is reserved */
- /* Slot 102 is reserved */
- /* Slot 103 is reserved */
-@@ -285,20 +281,13 @@ TIFFTCLAPI int		TIFFPredictorInit(TIFF *
- /* Slot 108 is reserved */
- /* Slot 109 is reserved */
- /* 110 */
--TIFFTCLAPI void		_TIFFSetupFieldInfo(TIFF *tiffptr,
--				const TIFFFieldInfo a[], size_t b);
- /* 111 */
--TIFFTCLAPI int		_TIFFMergeFieldInfo(TIFF *tiffptr,
--				const TIFFFieldInfo *a, int b);
- /* 112 */
- TIFFTCLAPI void		_TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a);
- /* 113 */
--TIFFTCLAPI const TIFFFieldInfo * TIFFFindFieldInfo(TIFF *tiffptr, ttag_t a,
--				TIFFDataType b);
- /* 114 */
--TIFFTCLAPI const TIFFFieldInfo * TIFFFieldWithTag(TIFF *tiffptr, ttag_t a);
-+TIFFTCLAPI const TIFFField * TIFFFieldWithTag(TIFF *tiffptr, uint32 a);
- /* 115 */
--TIFFTCLAPI TIFFDataType	 _TIFFSampleToTagType(TIFF *tiffptr);
- /* Slot 116 is reserved */
- /* Slot 117 is reserved */
- /* Slot 118 is reserved */
-@@ -306,43 +295,42 @@ TIFFTCLAPI TIFFDataType	 _TIFFSampleToTa
- /* 120 */
- TIFFTCLAPI int		_TIFFgetMode(const char *a, const char *b);
- /* 121 */
--TIFFTCLAPI int		_TIFFNoRowEncode(TIFF *tiffptr, tidata_t a,
--				tsize_t b, tsample_t c);
-+TIFFTCLAPI int		_TIFFNoRowEncode(TIFF *tiffptr, uint8 *a,
-+				tmsize_t b, uint16 c);
- /* 122 */
--TIFFTCLAPI int		_TIFFNoStripEncode(TIFF *tiffptr, tidata_t c,
--				tsize_t b, tsample_t a);
-+TIFFTCLAPI int		_TIFFNoStripEncode(TIFF *tiffptr, uint8 *c,
-+				tmsize_t b, uint16 a);
- /* 123 */
--TIFFTCLAPI int		_TIFFNoTileEncode(TIFF *tiffptr, tidata_t a,
--				tsize_t b, tsample_t c);
-+TIFFTCLAPI int		_TIFFNoTileEncode(TIFF *tiffptr, uint8 *a,
-+				tmsize_t b, uint16 c);
- /* 124 */
--TIFFTCLAPI int		_TIFFNoRowDecode(TIFF *tiffptr, tidata_t c,
--				tsize_t b, tsample_t a);
-+TIFFTCLAPI int		_TIFFNoRowDecode(TIFF *tiffptr, uint8 *c,
-+				tmsize_t b, uint16 a);
- /* 125 */
--TIFFTCLAPI int		_TIFFNoStripDecode(TIFF *tiffptr, tidata_t a,
--				tsize_t b, tsample_t c);
-+TIFFTCLAPI int		_TIFFNoStripDecode(TIFF *tiffptr, uint8 *a,
-+				tmsize_t b, uint16 c);
- /* 126 */
--TIFFTCLAPI int		_TIFFNoTileDecode(TIFF *tiffptr, tidata_t c,
--				tsize_t b, tsample_t a);
-+TIFFTCLAPI int		_TIFFNoTileDecode(TIFF *tiffptr, uint8 *c,
-+				tmsize_t b, uint16 a);
- /* 127 */
--TIFFTCLAPI void		_TIFFNoPostDecode(TIFF *tiffptr, tidata_t a,
--				tsize_t b);
-+TIFFTCLAPI void		_TIFFNoPostDecode(TIFF *tiffptr, uint8 *a,
-+				tmsize_t b);
- /* 128 */
--TIFFTCLAPI int		_TIFFNoPreCode(TIFF *tiffptr, tsample_t a);
-+TIFFTCLAPI int		_TIFFNoPreCode(TIFF *tiffptr, uint16 a);
- /* 129 */
- TIFFTCLAPI int		_TIFFNoSeek(TIFF *tiffptr, uint32 a);
- /* 130 */
--TIFFTCLAPI void		_TIFFSwab16BitData(TIFF *tiffptr, tidata_t a,
--				tsize_t b);
-+TIFFTCLAPI void		_TIFFSwab16BitData(TIFF *tiffptr, uint8 *a,
-+				tmsize_t b);
- /* 131 */
--TIFFTCLAPI void		_TIFFSwab32BitData(TIFF *tiffptr, tidata_t b,
--				tsize_t a);
-+TIFFTCLAPI void		_TIFFSwab32BitData(TIFF *tiffptr, uint8 *b,
-+				tmsize_t a);
- /* 132 */
--TIFFTCLAPI void		_TIFFSwab64BitData(TIFF *tiffptr, tidata_t a,
--				tsize_t b);
-+TIFFTCLAPI void		_TIFFSwab64BitData(TIFF *tiffptr, uint8 *a,
-+				tmsize_t b);
- /* 133 */
- TIFFTCLAPI int		TIFFFlushData1(TIFF *tiffptr);
- /* 134 */
--TIFFTCLAPI void		TIFFFreeDirectory(TIFF *tiffptr);
- /* 135 */
- TIFFTCLAPI int		TIFFDefaultDirectory(TIFF *tiffptr);
- /* 136 */
-@@ -401,6 +389,8 @@ TIFFTCLAPI int		TIFFInitZIP(TIFF *tiffpt
- TIFFTCLAPI int		TIFFInitPixarLog(TIFF *tiffptr, int a);
- /* 162 */
- TIFFTCLAPI int		TIFFInitSGILog(TIFF *tiffptr, int a);
-+/* 163 */
-+TIFFTCLAPI int		TIFFInitLZMA(TIFF *tiffptr, int a);
- 
- typedef struct TifftclStubs {
-     int magic;
-@@ -410,27 +400,27 @@ typedef struct TifftclStubs {
-     const TIFFCodec * (*tIFFFindCODEC) (uint16 a); /* 1 */
-     TIFFCodec * (*tIFFRegisterCODEC) (uint16 a, const char *b, TIFFInitMethod c); /* 2 */
-     void (*tIFFUnRegisterCODEC) (TIFFCodec *a); /* 3 */
--    tdata_t (*_TIFFmallocPtr) (tsize_t a); /* 4 */
--    tdata_t (*_TIFFreallocPtr) (tdata_t a, tsize_t b); /* 5 */
--    void (*_TIFFmemsetPtr) (tdata_t a, int b, tsize_t c); /* 6 */
--    void (*_TIFFmemcpyPtr) (tdata_t a, const tdata_t b, tsize_t c); /* 7 */
--    int (*_TIFFmemcmpPtr) (const tdata_t a, const tdata_t b, tsize_t c); /* 8 */
--    void (*_TIFFfreePtr) (tdata_t a); /* 9 */
-+    tdata_t (*_TIFFmallocPtr) (tmsize_t a); /* 4 */
-+    tdata_t (*_TIFFreallocPtr) (void *a, tmsize_t b); /* 5 */
-+    void (*_TIFFmemsetPtr) (void *a, int b, tmsize_t c); /* 6 */
-+    void (*_TIFFmemcpyPtr) (void *a, const void *b, tmsize_t c); /* 7 */
-+    int (*_TIFFmemcmpPtr) (const void *a, const void *b, tmsize_t c); /* 8 */
-+    void (*_TIFFfreePtr) (void *a); /* 9 */
-     void (*tIFFClose) (TIFF *tiffptr); /* 10 */
-     int (*tIFFFlush) (TIFF *tiffptr); /* 11 */
-     int (*tIFFFlushData) (TIFF *tiffptr); /* 12 */
--    int (*tIFFGetField) (TIFF *tiffptr, ttag_t a, ...); /* 13 */
--    int (*tIFFVGetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 14 */
--    int (*tIFFGetFieldDefaulted) (TIFF *tiffptr, ttag_t a, ...); /* 15 */
--    int (*tIFFVGetFieldDefaulted) (TIFF *tiffptr, ttag_t a, va_list b); /* 16 */
-+    int (*tIFFGetField) (TIFF *tiffptr, uint32 a, ...); /* 13 */
-+    int (*tIFFVGetField) (TIFF *tiffptr, uint32 a, va_list b); /* 14 */
-+    int (*tIFFGetFieldDefaulted) (TIFF *tiffptr, uint32 a, ...); /* 15 */
-+    int (*tIFFVGetFieldDefaulted) (TIFF *tiffptr, uint32 a, va_list b); /* 16 */
-     int (*tIFFReadDirectory) (TIFF *tiffptr); /* 17 */
--    tsize_t (*tIFFScanlineSize) (TIFF *tiffptr); /* 18 */
--    tsize_t (*tIFFRasterScanlineSize) (TIFF *tiffptr); /* 19 */
--    tsize_t (*tIFFStripSize) (TIFF *tiffptr); /* 20 */
--    tsize_t (*tIFFVStripSize) (TIFF *tiffptr, uint32 a); /* 21 */
--    tsize_t (*tIFFTileRowSize) (TIFF *tiffptr); /* 22 */
--    tsize_t (*tIFFTileSize) (TIFF *tiffptr); /* 23 */
--    tsize_t (*tIFFVTileSize) (TIFF *tiffptr, uint32 a); /* 24 */
-+    tmsize_t (*tIFFScanlineSize) (TIFF *tiffptr); /* 18 */
-+    tmsize_t (*tIFFRasterScanlineSize) (TIFF *tiffptr); /* 19 */
-+    tmsize_t (*tIFFStripSize) (TIFF *tiffptr); /* 20 */
-+    tmsize_t (*tIFFVStripSize) (TIFF *tiffptr, uint32 a); /* 21 */
-+    tmsize_t (*tIFFTileRowSize) (TIFF *tiffptr); /* 22 */
-+    tmsize_t (*tIFFTileSize) (TIFF *tiffptr); /* 23 */
-+    tmsize_t (*tIFFVTileSize) (TIFF *tiffptr, uint32 a); /* 24 */
-     uint32 (*tIFFDefaultStripSize) (TIFF *tiffptr, uint32 a); /* 25 */
-     void (*tIFFDefaultTileSize) (TIFF *tiffptr, uint32 *a, uint32 *b); /* 26 */
-     int (*tIFFFileno) (TIFF *tiffptr); /* 27 */
-@@ -440,28 +430,28 @@ typedef struct TifftclStubs {
-     int (*tIFFIsUpSampled) (TIFF *tiffptr); /* 31 */
-     int (*tIFFIsMSB2LSB) (TIFF *tiffptr); /* 32 */
-     uint32 (*tIFFCurrentRow) (TIFF *tiffptr); /* 33 */
--    tdir_t (*tIFFCurrentDirectory) (TIFF *tiffptr); /* 34 */
--    tdir_t (*tIFFNumberOfDirectories) (TIFF *tiffptr); /* 35 */
--    uint32 (*tIFFCurrentDirOffset) (TIFF *tiffptr); /* 36 */
--    tstrip_t (*tIFFCurrentStrip) (TIFF *tiffptr); /* 37 */
--    ttile_t (*tIFFCurrentTile) (TIFF *tiffptr); /* 38 */
--    int (*tIFFReadBufferSetup) (TIFF *tiffptr, tdata_t a, tsize_t b); /* 39 */
--    int (*tIFFWriteBufferSetup) (TIFF *tiffptr, tdata_t a, tsize_t b); /* 40 */
-+    uint16 (*tIFFCurrentDirectory) (TIFF *tiffptr); /* 34 */
-+    uint16 (*tIFFNumberOfDirectories) (TIFF *tiffptr); /* 35 */
-+    uint64 (*tIFFCurrentDirOffset) (TIFF *tiffptr); /* 36 */
-+    uint32 (*tIFFCurrentStrip) (TIFF *tiffptr); /* 37 */
-+    uint32 (*tIFFCurrentTile) (TIFF *tiffptr); /* 38 */
-+    int (*tIFFReadBufferSetup) (TIFF *tiffptr, void *a, tmsize_t b); /* 39 */
-+    int (*tIFFWriteBufferSetup) (TIFF *tiffptr, void *a, tmsize_t b); /* 40 */
-     int (*tIFFWriteCheck) (TIFF *tiffptr, int a, const char *b); /* 41 */
-     int (*tIFFCreateDirectory) (TIFF *tiffptr); /* 42 */
-     int (*tIFFLastDirectory) (TIFF *tiffptr); /* 43 */
--    int (*tIFFSetDirectory) (TIFF *tiffptr, tdir_t a); /* 44 */
--    int (*tIFFSetSubDirectory) (TIFF *tiffptr, uint32 a); /* 45 */
--    int (*tIFFUnlinkDirectory) (TIFF *tiffptr, tdir_t a); /* 46 */
--    int (*tIFFSetField) (TIFF *tiffptr, ttag_t a, ...); /* 47 */
--    int (*tIFFVSetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 48 */
-+    int (*tIFFSetDirectory) (TIFF *tiffptr, uint16 a); /* 44 */
-+    int (*tIFFSetSubDirectory) (TIFF *tiffptr, uint64 a); /* 45 */
-+    int (*tIFFUnlinkDirectory) (TIFF *tiffptr, uint16 a); /* 46 */
-+    int (*tIFFSetField) (TIFF *tiffptr, uint32 a, ...); /* 47 */
-+    int (*tIFFVSetField) (TIFF *tiffptr, uint32 a, va_list b); /* 48 */
-     int (*tIFFWriteDirectory) (TIFF *tiffptr); /* 49 */
--    int (*tIFFReassignTagToIgnore) (enum TIFFIgnoreSense a, int b); /* 50 */
-+    void (*reserved50)(void);
-     void (*tIFFPrintDirectory) (TIFF *tiffptr, FILE *a, long b); /* 51 */
--    int (*tIFFReadScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 52 */
--    int (*tIFFWriteScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 53 */
-+    int (*tIFFReadScanline) (TIFF *tiffptr, void *a, uint32 b, uint16 c); /* 52 */
-+    int (*tIFFWriteScanline) (TIFF *tiffptr, void *a, uint32 b, uint16 c); /* 53 */
-     int (*tIFFReadRGBAImage) (TIFF *tiffptr, uint32 a, uint32 b, uint32 *c, int d); /* 54 */
--    int (*tIFFReadRGBAStrip) (TIFF *tiffptr, tstrip_t a, uint32 *b); /* 55 */
-+    int (*tIFFReadRGBAStrip) (TIFF *tiffptr, uint32 a, uint32 *b); /* 55 */
-     int (*tIFFReadRGBATile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 *c); /* 56 */
-     int (*tIFFRGBAImageOK) (TIFF *tiffptr, char *a); /* 57 */
-     int (*tIFFRGBAImageBegin) (TIFFRGBAImage *a, TIFF *tiffptr, int b, char *c); /* 58 */
-@@ -476,29 +466,29 @@ typedef struct TifftclStubs {
-     TIFFErrorHandler (*tIFFSetErrorHandler) (TIFFErrorHandler a); /* 67 */
-     TIFFErrorHandler (*tIFFSetWarningHandler) (TIFFErrorHandler a); /* 68 */
-     TIFFExtendProc (*tIFFSetTagExtender) (TIFFExtendProc a); /* 69 */
--    ttile_t (*tIFFComputeTile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 c, tsample_t d); /* 70 */
--    int (*tIFFCheckTile) (TIFF *tiffptr, uint32 d, uint32 c, uint32 b, tsample_t a); /* 71 */
--    ttile_t (*tIFFNumberOfTiles) (TIFF *tiffptr); /* 72 */
--    tsize_t (*tIFFReadTile) (TIFF *tiffptr, tdata_t a, uint32 b, uint32 c, uint32 d, tsample_t e); /* 73 */
--    tsize_t (*tIFFWriteTile) (TIFF *tiffptr, tdata_t e, uint32 d, uint32 c, uint32 b, tsample_t a); /* 74 */
--    tstrip_t (*tIFFComputeStrip) (TIFF *tiffptr, uint32 a, tsample_t b); /* 75 */
--    tstrip_t (*tIFFNumberOfStrips) (TIFF *tiffptr); /* 76 */
--    tsize_t (*tIFFReadEncodedStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 77 */
--    tsize_t (*tIFFReadRawStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 78 */
--    tsize_t (*tIFFReadEncodedTile) (TIFF *tiffptr, ttile_t a, tdata_t b, tsize_t c); /* 79 */
--    tsize_t (*tIFFReadRawTile) (TIFF *tiffptr, ttile_t c, tdata_t b, tsize_t a); /* 80 */
--    tsize_t (*tIFFWriteEncodedStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 81 */
--    tsize_t (*tIFFWriteRawStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 82 */
--    tsize_t (*tIFFWriteEncodedTile) (TIFF *tiffptr, ttile_t a, tdata_t b, tsize_t c); /* 83 */
--    tsize_t (*tIFFWriteRawTile) (TIFF *tiffptr, ttile_t c, tdata_t b, tsize_t a); /* 84 */
-+    uint32 (*tIFFComputeTile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 c, uint16 d); /* 70 */
-+    int (*tIFFCheckTile) (TIFF *tiffptr, uint32 d, uint32 c, uint32 b, uint16 a); /* 71 */
-+    uint32 (*tIFFNumberOfTiles) (TIFF *tiffptr); /* 72 */
-+    tmsize_t (*tIFFReadTile) (TIFF *tiffptr, void *a, uint32 b, uint32 c, uint32 d, uint16 e); /* 73 */
-+    tmsize_t (*tIFFWriteTile) (TIFF *tiffptr, void *e, uint32 d, uint32 c, uint32 b, uint16 a); /* 74 */
-+    uint32 (*tIFFComputeStrip) (TIFF *tiffptr, uint32 a, uint16 b); /* 75 */
-+    uint32 (*tIFFNumberOfStrips) (TIFF *tiffptr); /* 76 */
-+    tmsize_t (*tIFFReadEncodedStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 77 */
-+    tmsize_t (*tIFFReadRawStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 78 */
-+    tmsize_t (*tIFFReadEncodedTile) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 79 */
-+    tmsize_t (*tIFFReadRawTile) (TIFF *tiffptr, uint32 c, void *b, tmsize_t a); /* 80 */
-+    tmsize_t (*tIFFWriteEncodedStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 81 */
-+    tmsize_t (*tIFFWriteRawStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 82 */
-+    tmsize_t (*tIFFWriteEncodedTile) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 83 */
-+    tmsize_t (*tIFFWriteRawTile) (TIFF *tiffptr, uint32 c, void *b, tmsize_t a); /* 84 */
-     void (*tIFFSetWriteOffset) (TIFF *tiffptr, toff_t a); /* 85 */
-     void (*tIFFSwabShort) (uint16 *a); /* 86 */
-     void (*tIFFSwabLong) (uint32 *a); /* 87 */
-     void (*tIFFSwabDouble) (double *a); /* 88 */
--    void (*tIFFSwabArrayOfShort) (uint16 *a, unsigned long b); /* 89 */
--    void (*tIFFSwabArrayOfLong) (uint32 *b, unsigned long a); /* 90 */
--    void (*tIFFSwabArrayOfDouble) (double *a, unsigned long b); /* 91 */
--    void (*tIFFReverseBits) (unsigned char *a, unsigned long b); /* 92 */
-+    void (*tIFFSwabArrayOfShort) (uint16 *a, tmsize_t b); /* 89 */
-+    void (*tIFFSwabArrayOfLong) (uint32 *b, tmsize_t a); /* 90 */
-+    void (*tIFFSwabArrayOfDouble) (double *a, tmsize_t b); /* 91 */
-+    void (*tIFFReverseBits) (unsigned char *a, tmsize_t b); /* 92 */
-     const unsigned char * (*tIFFGetBitRevTable) (int a); /* 93 */
-     void (*reserved94)(void);
-     void (*reserved95)(void);
-@@ -506,7 +496,7 @@ typedef struct TifftclStubs {
-     void (*reserved97)(void);
-     void (*reserved98)(void);
-     void (*reserved99)(void);
--    int (*tIFFPredictorInit) (TIFF *tiffptr); /* 100 */
-+    void (*reserved100)(void);
-     void (*reserved101)(void);
-     void (*reserved102)(void);
-     void (*reserved103)(void);
-@@ -516,31 +506,31 @@ typedef struct TifftclStubs {
-     void (*reserved107)(void);
-     void (*reserved108)(void);
-     void (*reserved109)(void);
--    void (*_TIFFSetupFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo a[], size_t b); /* 110 */
--    int (*_TIFFMergeFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo *a, int b); /* 111 */
-+    void (*reserved110)(void);
-+    void (*reserved111)(void);
-     void (*_TIFFPrintFieldInfoPtr) (TIFF *tiffptr, FILE *a); /* 112 */
--    const TIFFFieldInfo * (*tIFFFindFieldInfo) (TIFF *tiffptr, ttag_t a, TIFFDataType b); /* 113 */
--    const TIFFFieldInfo * (*tIFFFieldWithTag) (TIFF *tiffptr, ttag_t a); /* 114 */
--    TIFFDataType (*_TIFFSampleToTagTypePtr) (TIFF *tiffptr); /* 115 */
-+    void (*reserved113)(void);
-+    const TIFFField * (*tIFFFieldWithTag) (TIFF *tiffptr, uint32 a); /* 114 */
-+    void (*reserved115)(void);
-     void (*reserved116)(void);
-     void (*reserved117)(void);
-     void (*reserved118)(void);
-     void (*reserved119)(void);
-     int (*_TIFFgetModePtr) (const char *a, const char *b); /* 120 */
--    int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 121 */
--    int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 122 */
--    int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 123 */
--    int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 124 */
--    int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 125 */
--    int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 126 */
--    void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 127 */
--    int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, tsample_t a); /* 128 */
-+    int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 121 */
-+    int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 122 */
-+    int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 123 */
-+    int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 124 */
-+    int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 125 */
-+    int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 126 */
-+    void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 127 */
-+    int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, uint16 a); /* 128 */
-     int (*_TIFFNoSeekPtr) (TIFF *tiffptr, uint32 a); /* 129 */
--    void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 130 */
--    void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, tidata_t b, tsize_t a); /* 131 */
--    void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 132 */
-+    void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 130 */
-+    void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, uint8 *b, tmsize_t a); /* 131 */
-+    void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 132 */
-     int (*tIFFFlushData1) (TIFF *tiffptr); /* 133 */
--    void (*tIFFFreeDirectory) (TIFF *tiffptr); /* 134 */
-+    void (*reserved134)(void);
-     int (*tIFFDefaultDirectory) (TIFF *tiffptr); /* 135 */
-     int (*tIFFSetCompressionScheme) (TIFF *tiffptr, int a); /* 136 */
-     void (*_TIFFSetDefaultCompressionStatePtr) (TIFF *tiffptr); /* 137 */
-@@ -569,6 +559,7 @@ typedef struct TifftclStubs {
-     int (*tIFFInitZIP) (TIFF *tiffptr, int a); /* 160 */
-     int (*tIFFInitPixarLog) (TIFF *tiffptr, int a); /* 161 */
-     int (*tIFFInitSGILog) (TIFF *tiffptr, int a); /* 162 */
-+    int (*tIFFInitLZMA) (TIFF *tiffptr, int a); /* 163 */
- } TifftclStubs;
- 
- #ifdef __cplusplus
-@@ -685,8 +676,7 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
- 	(tifftclStubsPtr->tIFFVSetField) /* 48 */
- #define TIFFWriteDirectory \
- 	(tifftclStubsPtr->tIFFWriteDirectory) /* 49 */
--#define TIFFReassignTagToIgnore \
--	(tifftclStubsPtr->tIFFReassignTagToIgnore) /* 50 */
-+/* Slot 50 is reserved */
- #define TIFFPrintDirectory \
- 	(tifftclStubsPtr->tIFFPrintDirectory) /* 51 */
- #define TIFFReadScanline \
-@@ -779,8 +769,7 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
- /* Slot 97 is reserved */
- /* Slot 98 is reserved */
- /* Slot 99 is reserved */
--#define TIFFPredictorInit \
--	(tifftclStubsPtr->tIFFPredictorInit) /* 100 */
-+/* Slot 100 is reserved */
- /* Slot 101 is reserved */
- /* Slot 102 is reserved */
- /* Slot 103 is reserved */
-@@ -790,18 +779,14 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
- /* Slot 107 is reserved */
- /* Slot 108 is reserved */
- /* Slot 109 is reserved */
--#define _TIFFSetupFieldInfo \
--	(tifftclStubsPtr->_TIFFSetupFieldInfoPtr) /* 110 */
--#define _TIFFMergeFieldInfo \
--	(tifftclStubsPtr->_TIFFMergeFieldInfoPtr) /* 111 */
-+/* Slot 110 is reserved */
-+/* Slot 111 is reserved */
- #define _TIFFPrintFieldInfo \
- 	(tifftclStubsPtr->_TIFFPrintFieldInfoPtr) /* 112 */
--#define TIFFFindFieldInfo \
--	(tifftclStubsPtr->tIFFFindFieldInfo) /* 113 */
-+/* Slot 113 is reserved */
- #define TIFFFieldWithTag \
- 	(tifftclStubsPtr->tIFFFieldWithTag) /* 114 */
--#define _TIFFSampleToTagType \
--	(tifftclStubsPtr->_TIFFSampleToTagTypePtr) /* 115 */
-+/* Slot 115 is reserved */
- /* Slot 116 is reserved */
- /* Slot 117 is reserved */
- /* Slot 118 is reserved */
-@@ -834,8 +819,7 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
- 	(tifftclStubsPtr->_TIFFSwab64BitDataPtr) /* 132 */
- #define TIFFFlushData1 \
- 	(tifftclStubsPtr->tIFFFlushData1) /* 133 */
--#define TIFFFreeDirectory \
--	(tifftclStubsPtr->tIFFFreeDirectory) /* 134 */
-+/* Slot 134 is reserved */
- #define TIFFDefaultDirectory \
- 	(tifftclStubsPtr->tIFFDefaultDirectory) /* 135 */
- #define TIFFSetCompressionScheme \
-@@ -892,6 +876,8 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
- 	(tifftclStubsPtr->tIFFInitPixarLog) /* 161 */
- #define TIFFInitSGILog \
- 	(tifftclStubsPtr->tIFFInitSGILog) /* 162 */
-+#define TIFFInitLZMA \
-+	(tifftclStubsPtr->tIFFInitLZMA) /* 163 */
- 
- #endif /* defined(USE_TIFFTCL_STUBS) */
- 
-diff -up tkimg1.4/libtiff/tifftclStubInit.c.tiff4 tkimg1.4/libtiff/tifftclStubInit.c
---- tkimg1.4/libtiff/tifftclStubInit.c.tiff4	2010-06-30 11:03:06.000000000 -0400
-+++ tkimg1.4/libtiff/tifftclStubInit.c	2012-05-07 10:55:28.721144191 -0400
-@@ -70,7 +70,7 @@ const TifftclStubs tifftclStubs = {
-     TIFFSetField, /* 47 */
-     TIFFVSetField, /* 48 */
-     TIFFWriteDirectory, /* 49 */
--    TIFFReassignTagToIgnore, /* 50 */
-+    0, /* 50 */
-     TIFFPrintDirectory, /* 51 */
-     TIFFReadScanline, /* 52 */
-     TIFFWriteScanline, /* 53 */
-@@ -120,7 +120,7 @@ const TifftclStubs tifftclStubs = {
-     0, /* 97 */
-     0, /* 98 */
-     0, /* 99 */
--    TIFFPredictorInit, /* 100 */
-+    0, /* 100 */
-     0, /* 101 */
-     0, /* 102 */
-     0, /* 103 */
-@@ -130,12 +130,12 @@ const TifftclStubs tifftclStubs = {
-     0, /* 107 */
-     0, /* 108 */
-     0, /* 109 */
--    _TIFFSetupFieldInfo, /* 110 */
--    _TIFFMergeFieldInfo, /* 111 */
-+    0, /* 110 */
-+    0, /* 111 */
-     _TIFFPrintFieldInfo, /* 112 */
--    TIFFFindFieldInfo, /* 113 */
-+    0, /* 113 */
-     TIFFFieldWithTag, /* 114 */
--    _TIFFSampleToTagType, /* 115 */
-+    0, /* 115 */
-     0, /* 116 */
-     0, /* 117 */
-     0, /* 118 */
-@@ -154,7 +154,7 @@ const TifftclStubs tifftclStubs = {
-     _TIFFSwab32BitData, /* 131 */
-     _TIFFSwab64BitData, /* 132 */
-     TIFFFlushData1, /* 133 */
--    TIFFFreeDirectory, /* 134 */
-+    0, /* 134 */
-     TIFFDefaultDirectory, /* 135 */
-     TIFFSetCompressionScheme, /* 136 */
-     _TIFFSetDefaultCompressionState, /* 137 */
-@@ -239,6 +239,12 @@ const TifftclStubs tifftclStubs = {
- #else  /* !LOGLUV_SUPPORT */
-     TIFFInitSGILog, /* 162 */
- #endif /* !LOGLUV_SUPPORT */
-+#if !defined(LZMA_SUPPORT)
-+    0, /* 163 */
-+#else
-+    TIFFInitLZMA, /* 163 */
-+#endif /* !LZMA_SUPPORT */
-+
- };
- 
- /* !END!: Do not edit above this line. */
-diff -up tkimg1.4/tests/tiff.test.tiff4 tkimg1.4/tests/tiff.test
---- tkimg1.4/tests/tiff.test.tiff4	2012-05-07 10:59:04.260503681 -0400
-+++ tkimg1.4/tests/tiff.test	2012-05-07 10:59:26.283349663 -0400
-@@ -18,10 +18,10 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAA
- AAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAAB
--ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAAC9gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
-+ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAADBgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
- AAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEWAAMAAAABAAwAAAEXAAQAAAAB
--AAACQAEaAAUAAAABAAAC/AEbAAUAAAABAAADBAEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
--AAAACAAIAAgSwAAAAAQAABLAAAAABAAA}
-+AAACQAEaAAUAAAABAAAC9gEbAAUAAAABAAAC/gEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
-+AAAAAASwAAAAAQAABLAAAAABAAgACAAI}
- 
- test tiff-1.1 {} {
-     catch {image delete i}
-diff -up tkimg1.4/tiff/tests/tiff.test.tiff4 tkimg1.4/tiff/tests/tiff.test
---- tkimg1.4/tiff/tests/tiff.test.tiff4	2012-05-07 11:00:25.993941462 -0400
-+++ tkimg1.4/tiff/tests/tiff.test	2012-05-07 11:00:44.606813135 -0400
-@@ -16,10 +16,10 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAA
- AAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAAB
--ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAAC9gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
-+ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAADBgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
- AAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEWAAMAAAABAAwAAAEXAAQAAAAB
--AAACQAEaAAUAAAABAAAC/AEbAAUAAAABAAADBAEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
--AAAACAAIAAgSwAAAAAQAABLAAAAABAAA}
-+AAACQAEaAAUAAAABAAAC9gEbAAUAAAABAAAC/gEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
-+AAAAAASwAAAAAQAABLAAAAABAAgACAAI}
- 
- test tiff-1.1 {} {
-     catch {image delete i}
-diff -up tkimg1.4/tiff/tiff.c.tiff4 tkimg1.4/tiff/tiff.c
---- tkimg1.4/tiff/tiff.c.tiff4	2012-05-07 10:55:28.698144366 -0400
-+++ tkimg1.4/tiff/tiff.c	2012-05-07 10:55:28.722144183 -0400
-@@ -115,8 +115,8 @@ SetupTiffLibrary (interp)
-     if (!initialized) {
- 	initialized = 1;
- 	if (
--	    TIFFRegisterCODEC   && TIFFError        && TIFFPredictorInit &&
--	    _TIFFMergeFieldInfo  && TIFFFlushData1   && _TIFFNoPostDecode &&
-+	    TIFFRegisterCODEC   && TIFFError        &&
-+	    TIFFFlushData1   && _TIFFNoPostDecode &&
- 	    TIFFTileRowSize     && TIFFScanlineSize && _TIFFsetByteArray &&
- 	    TIFFVSetField       && TIFFSwabArrayOfShort
- 	    ) {
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-zlib-1.2.6.patch b/dev-tcltk/tkimg/files/tkimg-1.4-zlib-1.2.6.patch
deleted file mode 100644
index e6b55133d616..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-zlib-1.2.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- zlib/zlibtclDecls.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
-index d6666ab..416f42d 100644
---- a/zlib/zlibtclDecls.h
-+++ b/zlib/zlibtclDecls.h
-@@ -120,7 +120,7 @@ ZEXTERN char *		gzgets(gzFile file, char *buf, int len);
- /* 38 */
- ZEXTERN int		gzputc(gzFile file, int c);
- /* 39 */
--ZEXTERN int		gzgetc(gzFile file);
-+ZEXTERN int		gzgetc_(gzFile file);
- /* 40 */
- ZEXTERN int		gzflush(gzFile file, int flush);
- /* 41 */
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch b/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
deleted file mode 100644
index 64584f5ebbed..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up tkimg1.4/zlib/zlibtcl.decls.gzgetc_fix tkimg1.4/zlib/zlibtcl.decls
---- tkimg1.4/zlib/zlibtcl.decls.gzgetc_fix	2012-07-31 14:54:11.104302862 -0400
-+++ tkimg1.4/zlib/zlibtcl.decls	2012-07-31 14:54:24.846303790 -0400
-@@ -138,7 +138,7 @@ declare 38 {
-     int gzputc(gzFile file, int c)
- }
- declare 39 {
--    int gzgetc(gzFile file)
-+    int gzgetc_(gzFile file)
- }
- declare 40 {
-     int gzflush(gzFile file, int flush)
-diff -up tkimg1.4/zlib/zlibtclDecls.h.gzgetc_fix tkimg1.4/zlib/zlibtclDecls.h
---- tkimg1.4/zlib/zlibtclDecls.h.gzgetc_fix	2012-07-31 14:55:12.754307116 -0400
-+++ tkimg1.4/zlib/zlibtclDecls.h	2012-07-31 14:55:17.520307957 -0400
-@@ -179,7 +179,7 @@ typedef struct ZlibtclStubs {
-     int (*gzputsPtr) (gzFile file, const char *s); /* 36 */
-     char * (*gzgetsPtr) (gzFile file, char *buf, int len); /* 37 */
-     int (*gzputcPtr) (gzFile file, int c); /* 38 */
--    int (*gzgetcPtr) (gzFile file); /* 39 */
-+    int (*gzgetc_Ptr) (gzFile file); /* 39 */
-     int (*gzflushPtr) (gzFile file, int flush); /* 40 */
-     z_off_t (*gzseekPtr) (gzFile file, z_off_t offset, int whence); /* 41 */
-     int (*gzrewindPtr) (gzFile file); /* 42 */
-@@ -273,8 +273,8 @@ ZEXTERN const ZlibtclStubs *zlibtclStubs
- 	(zlibtclStubsPtr->gzgetsPtr) /* 37 */
- #define gzputc \
- 	(zlibtclStubsPtr->gzputcPtr) /* 38 */
--#define gzgetc \
--	(zlibtclStubsPtr->gzgetcPtr) /* 39 */
-+#define gzgetc_ \
-+	(zlibtclStubsPtr->gzgetc_Ptr) /* 39 */
- #define gzflush \
- 	(zlibtclStubsPtr->gzflushPtr) /* 40 */
- #define gzseek \
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild
deleted file mode 100644
index 2654a9214024..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild,v 1.8 2014/01/14 16:16:56 jlec Exp $
-
-EAPI=4
-
-VIRTUALX_USE=test
-
-inherit eutils multilib prefix toolchain-funcs virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz
-	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	media-libs/tiff:0
-	media-libs/libpng:0
-	>=sys-libs/zlib-1.2.7
-	x11-libs/libX11
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-# Fails with jpeg-turbo silently, #386253
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
-		"${FILESDIR}"/${P}-jbig.patch \
-		"${FILESDIR}"/${P}-zlib-1.2.6.patch \
-		"${FILESDIR}"/${P}-libtiff.patch \
-		"${FILESDIR}"/${P}-libtiff4.patch \
-		"${FILESDIR}"/${P}-zlib127-gzgetc_fix.patch
-
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
-	sed \
-		-e 's:-O2 -fomit-frame-pointer::g' \
-		-e 's: -pipe::g' \
-		-i */configure  || die
-
-	eprefixify */*.h
-	tc-export AR
-}
-
-src_test() {
-	Xemake test || die "Xmake failed"
-}
-
-src_install() {
-	local l bl
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
-	fi
-
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/*
-	fi
-}