diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-07-04 11:47:53 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-07-04 11:47:53 +0000 |
commit | 6e306101e9b7e28da575dcd26031be46208fdf57 (patch) | |
tree | 63ad56e2a2370974b681c43ffe58371128619101 /dev-tcltk | |
parent | x86 stable wrt bug #321767 (diff) | |
download | historical-6e306101e9b7e28da575dcd26031be46208fdf57.tar.gz historical-6e306101e9b7e28da575dcd26031be46208fdf57.tar.bz2 historical-6e306101e9b7e28da575dcd26031be46208fdf57.zip |
Removed old patches
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-tcltk')
-rw-r--r-- | dev-tcltk/tkimg/ChangeLog | 8 | ||||
-rw-r--r-- | dev-tcltk/tkimg/Manifest | 11 | ||||
-rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch | 56 | ||||
-rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch | 221 | ||||
-rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch | 35 |
5 files changed, 11 insertions, 320 deletions
diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog index de23f0f0934a..38a740336528 100644 --- a/dev-tcltk/tkimg/ChangeLog +++ b/dev-tcltk/tkimg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-tcltk/tkimg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.17 2010/06/28 19:19:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.18 2010/07/04 11:47:53 jlec Exp $ + + 04 Jul 2010; Justin Lecher <jlec@gentoo.org> + -files/tkimg-1.3.20081202-prefix.patch, + -files/tkimg-1.3.20081202-systemlibs.patch, + -files/tkimg-1.3.20081202-tests.patch: + Removed old patches 28 Jun 2010; Justin Lecher <jlec@gentoo.org> -tkimg-1.3.20081202.ebuild, -tkimg-1.3.20081202-r1.ebuild: diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index 31ab4aed85f3..339f40d1bd39 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,18 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX tkimg-1.3.20081202-prefix.patch 1786 RMD160 ad867dde7d6e431caaee180093eac6bc0e5bb1f6 SHA1 c6eb5eadf43c455ae28335215393f9fdc3c23def SHA256 6f66f0d0b95e282a6ed082dac34db387aa4bbe13c2ab56f1baef6f66682574a5 -AUX tkimg-1.3.20081202-systemlibs.patch 9637 RMD160 fc6a94501654307bae837731f18e8a827eb21db4 SHA1 87e9d8a3d60da0a42b92d9a1c35ab989452b4645 SHA256 29608daf79cca4a6b1292d1875ebd7d5f07ad60d4e09098ea5b8ece801da1983 -AUX tkimg-1.3.20081202-tests.patch 982 RMD160 ae52f7b9eb1504c1c116fe384abe3db806523239 SHA1 decd791a9ac761bfee56a0114a407960976a2a52 SHA256 28bc15f436d73cbd7ae91dc480aacc51dbcf5f3fa7125640742cfea9aed964b6 AUX tkimg-1.4.20100510-gentoo.patch 9029 RMD160 5f5a8b699959cffe480df693aded7a41417d2fc6 SHA1 43a5fa102e6d6b9c2813d75a7149bfc434fa4bd2 SHA256 61a2354408092d2e86e549e3e2f93d73d2b3ee2b18d4950a7a1f430b9121e17e DIST tkimg-1.4.20100510.tar.bz2 4625881 RMD160 3d5a6e4186afd4487333e6b069a756810560147d SHA1 42befa7cf86c5c6271fe86bdbad2f0e0953acee1 SHA256 74b60431d6ae3767132d7f334af1a208b978d99e7b2710db84dc3da95b5ff0ae EBUILD tkimg-1.4.20100510.ebuild 1421 RMD160 ceda0aa3e32f4fb953636ade1032b816e3ab8aa4 SHA1 a6fc92019aa8f36deef5519403a5c75bfd3c42e3 SHA256 368d2a37af00e22f6da0d384f5807bd207538c95d1f3b6deef3738ce0a68bdcd -MISC ChangeLog 3222 RMD160 b79932a96fdd37750562d39d6199d5aacfe8249d SHA1 6286202c538d99640a2ad9590756945faea7959e SHA256 a23d33ef5d3af7e3f3fef42715cfcdc5c59c99c8346fb17bc61195edc90f2796 +MISC ChangeLog 3421 RMD160 2429105f825d8e519b1a297ee5b476dcd24f1d61 SHA1 b39b712fff0c8a24dcbb22a0ac09e750fae1e8ff SHA256 05e588c49d52cf4521f442337a8cdd9144e7d418acecd60e6159a449bfa8afbb MISC metadata.xml 413 RMD160 1ac848d3c3c9bdc181eb74296bed320a04939230 SHA1 b87cf6e1539c38b9d47206b3de300d4d1b015e19 SHA256 e4be7858b69d8be49bd900961e05825edcacfb4c81b6f20ebc6afd65fb3b2fc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwo9bIACgkQgAnW8HDreRb0YwCgjQsWOrdMYyIAThZ2+IZQihzO -1KkAoKi/PUF4w+ioqf7/Vwwod80khRoW -=SMRV +iEYEARECAAYFAkwwdO8ACgkQgAnW8HDreRZ2rgCgijzmr3iRCng20ZaW8XOWTpuG +1PQAn3wcqAbOL0iwcilRTZPykMSCEERF +=POWZ -----END PGP SIGNATURE----- diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch deleted file mode 100644 index aa9cf460e578..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/libjpeg/tcl/jpegtclDecls.h b/libjpeg/tcl/jpegtclDecls.h -index 49aa75f..2a22ce4 100644 ---- a/libjpeg/tcl/jpegtclDecls.h -+++ b/libjpeg/tcl/jpegtclDecls.h -@@ -20,8 +20,8 @@ - #undef EXTERN - - #include "jpegtclDeclsMask.h" --#include </usr/include/jpeglib.h> --#include </usr/include/jerror.h> -+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h> -+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h> - #include "jpegtclDeclsUnmask.h" - - /* -diff --git a/libpng/tcl/pngtclDecls.h b/libpng/tcl/pngtclDecls.h -index a50bbc3..06ed339 100644 ---- a/libpng/tcl/pngtclDecls.h -+++ b/libpng/tcl/pngtclDecls.h -@@ -16,7 +16,7 @@ - - #include <tcl.h> - #include <pngtclDeclsMask.h> --#include </usr/include/libpng12/png.h> -+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/libpng12/png.h> - #include <pngtclDeclsUnmask.h> - - /* !BEGIN!: Do not edit below this line. */ -diff --git a/libtiff/tcl/tifftclDecls.h b/libtiff/tcl/tifftclDecls.h -index 0e85387..a158604 100644 ---- a/libtiff/tcl/tifftclDecls.h -+++ b/libtiff/tcl/tifftclDecls.h -@@ -25,8 +25,8 @@ - - #include <tifftclDeclsMask.h> - #include "../libtiff/tiffiop.h" --#include </usr/include/tiff.h> --#include </usr/include/tiffio.h> -+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h> -+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h> - #include "../libtiff/tiffiop.h" - #include "../libtiff/tif_predict.h" - #include <tifftclDeclsUnmask.h> -diff --git a/libz/tcl/zlibtclDecls.h b/libz/tcl/zlibtclDecls.h -index 73171b1..81a5613 100644 ---- a/libz/tcl/zlibtclDecls.h -+++ b/libz/tcl/zlibtclDecls.h -@@ -17,7 +17,7 @@ - - #include <tcl.h> - #include <zlibtclDeclsMask.h> --#include </usr/include/zlib.h> -+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h> - #include <zlibtclDeclsUnmask.h> - - /* !BEGIN!: Do not edit below this line. */ diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch deleted file mode 100644 index 183ce94fb442..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h ---- tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h 2008-10-22 11:55:37.933226000 +0100 -+++ tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h 2008-12-02 19:54:15.180187733 +0000 -@@ -19,10 +19,10 @@ - /* undef Tcl macros that conflict with libjpeg stuff (sigh) */ - #undef EXTERN - --#include <jpegtclDeclsMask.h> --#include <../jpeglib.h> --#include <../jerror.h> --#include <jpegtclDeclsUnmask.h> -+#include "jpegtclDeclsMask.h" -+#include </usr/include/jpeglib.h> -+#include </usr/include/jerror.h> -+#include "jpegtclDeclsUnmask.h" - - /* - * And recreate the definition of "tcl.h", we need it below. -diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in tkimg-1.3.20081202/libjpeg/tcl/Makefile.in ---- tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100 -+++ tkimg-1.3.20081202/libjpeg/tcl/Makefile.in 2008-12-02 19:54:15.180187733 +0000 -@@ -33,8 +33,8 @@ - # $(srcdir) or in the generic, win or unix subdirectory. - #======================================================================== - --PKG_SOURCES = @PKG_SOURCES@ --PKG_OBJECTS = @PKG_OBJECTS@ -+PKG_SOURCES = jpegtcl.c jpegtclStubInit.c -+PKG_OBJECTS = jpegtcl.o jpegtclStubInit.o - - PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ - PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ -@@ -106,7 +106,7 @@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ - SHLIB_LD = @SHLIB_LD@ --SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg - STLIB_LD = @STLIB_LD@ - TCL_DEFS = @TCL_DEFS@ - TCL_BIN_DIR = @TCL_BIN_DIR@ -diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in tkimg-1.3.20081202/libpng/tcl/Makefile.in ---- tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100 -+++ tkimg-1.3.20081202/libpng/tcl/Makefile.in 2008-12-02 19:54:19.759763931 +0000 -@@ -37,8 +37,8 @@ - # $(srcdir) or in the generic, win or unix subdirectory. - #======================================================================== - --PKG_SOURCES = @PKG_SOURCES@ --PKG_OBJECTS = @PKG_OBJECTS@ -+PKG_SOURCES = pngtcl.c pngtclStubInit.c -+PKG_OBJECTS = pngtcl.o pngtclStubInit.o - - PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ - PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ -@@ -110,7 +110,7 @@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ - SHLIB_LD = @SHLIB_LD@ --SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lpng12 - STLIB_LD = @STLIB_LD@ - TCL_DEFS = @TCL_DEFS@ - TCL_BIN_DIR = @TCL_BIN_DIR@ -diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h ---- tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h 2008-10-22 11:55:37.933226000 +0100 -+++ tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h 2008-12-02 19:54:19.763764769 +0000 -@@ -16,7 +16,7 @@ - - #include <tcl.h> - #include <pngtclDeclsMask.h> --#include <../png.h> -+#include </usr/include/libpng12/png.h> - #include <pngtclDeclsUnmask.h> - - /* !BEGIN!: Do not edit below this line. */ -@@ -221,15 +221,15 @@ - png_infopp info_ptr_ptr, - png_infopp end_info_ptr_ptr)); - /* 62 */ --EXTERN void png_read_destroy _ANSI_ARGS_((png_structp png_ptr, -- png_infop info_ptr, png_infop end_info_ptr)); -+/*EXTERN void png_read_destroy _ANSI_ARGS_((png_structp png_ptr, -+ png_infop info_ptr, png_infop end_info_ptr));*/ - /* 63 */ - EXTERN void png_destroy_write_struct _ANSI_ARGS_(( - png_structpp png_ptr_ptr, - png_infopp info_ptr_ptr)); - /* Slot 64 is reserved */ - /* 65 */ --EXTERN void png_write_destroy _ANSI_ARGS_((png_structp png_ptr)); -+/*EXTERN void png_write_destroy _ANSI_ARGS_((png_structp png_ptr));*/ - /* 66 */ - EXTERN void png_set_crc_action _ANSI_ARGS_((png_structp png_ptr, - int crit_action, int ancil_action)); -@@ -1171,10 +1171,10 @@ - void (*png_read_end) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr)); /* 59 */ - void (*png_destroy_info_struct) _ANSI_ARGS_((png_structp png_ptr, png_infopp info_ptr_ptr)); /* 60 */ - void (*png_destroy_read_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); /* 61 */ -- void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); /* 62 */ -+/* void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); */ /* 62 */ - void (*png_destroy_write_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); /* 63 */ - void *reserved64; -- void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); /* 65 */ -+/* void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); */ /* 65 */ - void (*png_set_crc_action) _ANSI_ARGS_((png_structp png_ptr, int crit_action, int ancil_action)); /* 66 */ - void (*png_set_filter) _ANSI_ARGS_((png_structp png_ptr, int method, int filters)); /* 67 */ - void (*png_set_filter_heuristics) _ANSI_ARGS_((png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs)); /* 68 */ -diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c ---- tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c 2008-10-22 13:06:38.458408000 +0100 -+++ tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c 2008-12-02 19:54:19.763764769 +0000 -@@ -205,10 +205,10 @@ - png_read_end, /* 59 */ - png_destroy_info_struct, /* 60 */ - png_destroy_read_struct, /* 61 */ -- png_read_destroy, /* 62 */ -+/* png_read_destroy, */ /* 62 */ - png_destroy_write_struct, /* 63 */ - NULL, /* 64 */ -- png_write_destroy, /* 65 */ -+/* png_write_destroy, */ /* 65 */ - png_set_crc_action, /* 66 */ - png_set_filter, /* 67 */ - #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED) -diff -Nur tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in tkimg-1.3.20081202/libtiff/tcl/Makefile.in ---- tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100 -+++ tkimg-1.3.20081202/libtiff/tcl/Makefile.in 2008-12-02 19:54:28.771023604 +0000 -@@ -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 = tifftcl.c tifftclStubInit.c -+PKG_OBJECTS = tifftcl.o tifftclStubInit.o - - PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ - PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ -@@ -108,7 +108,7 @@ - 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 -Nur tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h ---- tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h 2008-10-22 11:55:37.933226000 +0100 -+++ tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h 2008-12-02 19:54:28.775023325 +0000 -@@ -24,9 +24,11 @@ - #undef INLINE - - #include <tifftclDeclsMask.h> --#include <../libtiff/tiffio.h> --#include <../libtiff/tiffiop.h> --#include <../libtiff/tif_predict.h> -+#include "../libtiff/tiffiop.h" -+#include </usr/include/tiff.h> -+#include </usr/include/tiffio.h> -+#include "../libtiff/tiffiop.h" -+#include "../libtiff/tif_predict.h" - #include <tifftclDeclsUnmask.h> - - /* !BEGIN!: Do not edit below this line. */ -diff -Nur tkimg-1.3.20081202.orig/libz/tcl/configure.in tkimg-1.3.20081202/libz/tcl/configure.in ---- tkimg-1.3.20081202.orig/libz/tcl/configure.in 2007-10-13 00:39:51.771426000 +0100 -+++ tkimg-1.3.20081202/libz/tcl/configure.in 2008-12-02 19:54:25.307377006 +0000 -@@ -47,16 +47,12 @@ - #----------------------------------------------------------------------- - - TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c]) --TEA_ADD_SOURCES([../adler32.c ../compress.c ../crc32.c]) --TEA_ADD_SOURCES([../deflate.c ../gzio.c ../infback.c]) --TEA_ADD_SOURCES([../inffast.c ../inflate.c ../inftrees.c]) --TEA_ADD_SOURCES([../trees.c ../uncompr.c ../zutil.c]) - - TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h]) - TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h]) - - TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"]) --TEA_ADD_LIBS([]) -+TEA_ADD_LIBS([-lz]) - TEA_ADD_CFLAGS([]) - TEA_ADD_STUB_SOURCES([zlibtclStubLib.c]) - TEA_ADD_SOURCES([zlibtclStubLib.c]) -diff -Nur tkimg-1.3.20081202.orig/libz/tcl/Makefile.in tkimg-1.3.20081202/libz/tcl/Makefile.in ---- tkimg-1.3.20081202.orig/libz/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100 -+++ tkimg-1.3.20081202/libz/tcl/Makefile.in 2008-12-02 19:54:25.307377006 +0000 -@@ -33,8 +33,8 @@ - # $(srcdir) or in the generic, win or unix subdirectory. - #======================================================================== - --PKG_SOURCES = @PKG_SOURCES@ --PKG_OBJECTS = @PKG_OBJECTS@ -+PKG_SOURCES = zlibtcl.c zlibtclStubInit.c -+PKG_OBJECTS = zlibtcl.o zlibtclStubInit.o - - PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ - PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ -@@ -106,7 +106,7 @@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ - SHLIB_LD = @SHLIB_LD@ --SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lz - STLIB_LD = @STLIB_LD@ - TCL_DEFS = @TCL_DEFS@ - TCL_BIN_DIR = @TCL_BIN_DIR@ -diff -Nur tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h ---- tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h 2008-10-22 11:55:37.933226000 +0100 -+++ tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h 2008-12-02 19:54:25.307377006 +0000 -@@ -17,7 +17,7 @@ - - #include <tcl.h> - #include <zlibtclDeclsMask.h> --#include <../zlib.h> -+#include </usr/include/zlib.h> - #include <zlibtclDeclsUnmask.h> - - /* !BEGIN!: Do not edit below this line. */ diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch deleted file mode 100644 index 3e5a1b412516..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -Source: http://sourceforge.net/tracker/index.php?func=detail&aid=2669482&group_id=52039&atid=465492 -$OpenBSD$ ---- Makefile.in.orig Mon Feb 23 01:03:15 2009 -+++ Makefile.in Thu Feb 26 10:53:51 2009 -@@ -103,12 +103,20 @@ all: - test: all - for sub in $(SUBDIRS) ; \ - do \ -+ test -d $(srcdir)/$$sub/tests || continue ; \ - here=`pwd` && \ - cd $$sub && \ -- $(MAKE) test || exit $$? && \ -+ $(MAKE) top_builddir=$$here test || exit $$? && \ - cd $$here ; \ - done - -+install-man: -+ mkdir -p $(MAN_INSTALL_DIR)/mann -+ for i in $(srcdir)/doc/*.man ; \ -+ do \ -+ dtplite -ext n -o $(MAN_INSTALL_DIR)/mann nroff $$i ; \ -+ done -+ - collate: all - rm -f pkgIndex.tcl - touch pkgIndex.tcl -@@ -133,7 +141,7 @@ collate: all - $$p > $$p.1 && mv -f $$p.1 $$p ; \ - done - --install: collate -+install: collate install-man - mkdir -p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR) - for p in Img/exec_prefix/lib/Img/* ; do \ - $(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)/`basename $$p` ; \ |