From 46d0ea16154484918155b6195882e103b10f2627 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Sat, 28 Apr 2007 03:35:12 +0000 Subject: [PATCH] Version bumped. Removed old versions, bug #160006. Package-Manager: portage-2.1.2.4 --- dev-tcltk/otcl/ChangeLog | 11 +- dev-tcltk/otcl/Manifest | 40 ++- dev-tcltk/otcl/files/digest-otcl-1.13 | 3 + dev-tcltk/otcl/files/digest-otcl-1.8-r3 | 3 - dev-tcltk/otcl/files/digest-otcl-1.9 | 3 - .../files/otcl-1.13-configure-cleanup.patch | 272 ++++++++++++++++++ .../otcl/files/otcl-1.8-badfreefix.patch | 265 ----------------- .../{otcl-1.9.ebuild => otcl-1.13.ebuild} | 39 +-- dev-tcltk/otcl/otcl-1.8-r3.ebuild | 56 ---- 9 files changed, 323 insertions(+), 369 deletions(-) create mode 100644 dev-tcltk/otcl/files/digest-otcl-1.13 delete mode 100644 dev-tcltk/otcl/files/digest-otcl-1.8-r3 delete mode 100644 dev-tcltk/otcl/files/digest-otcl-1.9 create mode 100644 dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch delete mode 100644 dev-tcltk/otcl/files/otcl-1.8-badfreefix.patch rename dev-tcltk/otcl/{otcl-1.9.ebuild => otcl-1.13.ebuild} (56%) delete mode 100644 dev-tcltk/otcl/otcl-1.8-r3.ebuild diff --git a/dev-tcltk/otcl/ChangeLog b/dev-tcltk/otcl/ChangeLog index 44780b1407bb..200994040360 100644 --- a/dev-tcltk/otcl/ChangeLog +++ b/dev-tcltk/otcl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-tcltk/otcl # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/ChangeLog,v 1.26 2007/02/22 01:29:34 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/ChangeLog,v 1.27 2007/04/28 03:35:12 matsuu Exp $ + +*otcl-1.13 (28 Apr 2007) + + 28 Apr 2007; MATSUU Takuto + -files/otcl-1.8-badfreefix.patch, + +files/otcl-1.13-configure-cleanup.patch, -otcl-1.8-r3.ebuild, + -otcl-1.9.ebuild, +otcl-1.13.ebuild: + Version bumped. + Removed old versions, bug #160006. 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/dev-tcltk/otcl/Manifest b/dev-tcltk/otcl/Manifest index 3f9b2fd8e805..8d5d44c2f189 100644 --- a/dev-tcltk/otcl/Manifest +++ b/dev-tcltk/otcl/Manifest @@ -6,29 +6,24 @@ AUX otcl-1.11-configure-cleanup.patch 8969 RMD160 1644a5b5677baaa9cab6471e2109a2 MD5 6f9c5b2330e0c26da1733406010d7381 files/otcl-1.11-configure-cleanup.patch 8969 RMD160 1644a5b5677baaa9cab6471e2109a20c901798b1 files/otcl-1.11-configure-cleanup.patch 8969 SHA256 5b7aa8765cecfe8734c113c1c73fac466a17699e3dff11742480fc4f9084e655 files/otcl-1.11-configure-cleanup.patch 8969 -AUX otcl-1.8-badfreefix.patch 7469 RMD160 9d7412cc8aa228e395c3e742825fab7eb108a3e8 SHA1 06258ed42c7526ed9b78fbc90edba533db4dcfcd SHA256 4ed1bae66e9c62b6fbcd7f71da7e9730f1e144d7413e27a08add83d2bb513061 -MD5 090aa64d1486dc3d916b9b5176179d30 files/otcl-1.8-badfreefix.patch 7469 -RMD160 9d7412cc8aa228e395c3e742825fab7eb108a3e8 files/otcl-1.8-badfreefix.patch 7469 -SHA256 4ed1bae66e9c62b6fbcd7f71da7e9730f1e144d7413e27a08add83d2bb513061 files/otcl-1.8-badfreefix.patch 7469 +AUX otcl-1.13-configure-cleanup.patch 8307 RMD160 5f8cef125030c29569a920633bbb0722b72595bf SHA1 c0c2d233c55b53d3fc1b4d07baa327809d948d13 SHA256 5fe1c053227c26a035fc6ecdf5d3ba4ddb38500133940f9a6966d0fbf51bc220 +MD5 273bec7ef4b95dcc175121c442a5ca07 files/otcl-1.13-configure-cleanup.patch 8307 +RMD160 5f8cef125030c29569a920633bbb0722b72595bf files/otcl-1.13-configure-cleanup.patch 8307 +SHA256 5fe1c053227c26a035fc6ecdf5d3ba4ddb38500133940f9a6966d0fbf51bc220 files/otcl-1.13-configure-cleanup.patch 8307 DIST otcl-1.11.tar.gz 315835 RMD160 02148865a0734fe01171f0456ed89beda1f6074e SHA1 a16f4b82e98a2fa9c6ba632e772af182f47f07d4 SHA256 ac4998748b5eb870898796beb55eba299660bee097d8dbfd10224281548cb94f -DIST otcl-1.8.tar.gz 300954 RMD160 2627e6a8d58bd7377c1cc9c4be34b463ad0d492a SHA1 7ff767c1d4ef981f7cfa207a2f277e726105d001 SHA256 31e92bfcd57b3bf9b972219361b91db22ff2c7b4c7d18be80e93b7d00b13079b -DIST otcl-1.9.tar.gz 309728 RMD160 f3021de27b40abbc6eb805a29b5facaa136e7167 SHA1 1ab1e40e7064720e04d7df56afc6d4a64aac2311 SHA256 3c5ca1d8f1c3fce788371a2b30b63e2f0b51f8c359672f78b101418786cbd09e +DIST otcl-src-1.13.tar.gz 317440 RMD160 7c0def77993ec6e48e4085d6a953b55c2fe2bc59 SHA1 e3310044628f0a59217abaa5ff8ac8234700dd83 SHA256 23b3b7a88fd5a7bfe9f91fd0afd0ac85981c1c2ff0cae6714aee54f7f38ab25d EBUILD otcl-1.11.ebuild 1506 RMD160 d583dd61f4d63bb6e2964b7e5a840adc4bbd3c4f SHA1 b98da8fd21103171177b4a7709cfacc0f53c2ec5 SHA256 a4c636ceff2d9300a70963fd26308a1acf658ef7afa702feaf9093de7e1a0413 MD5 1038aa2dcec3111af1676b82845dbf9d otcl-1.11.ebuild 1506 RMD160 d583dd61f4d63bb6e2964b7e5a840adc4bbd3c4f otcl-1.11.ebuild 1506 SHA256 a4c636ceff2d9300a70963fd26308a1acf658ef7afa702feaf9093de7e1a0413 otcl-1.11.ebuild 1506 -EBUILD otcl-1.8-r3.ebuild 1409 RMD160 503db566fe326e93db41e7b3a20b8a62dc5efb82 SHA1 93da74e0efef6e7e46cf2b2ae6a70ae06881693e SHA256 e648941ad4f0a45086b86655debd0c161fe75ab819926ceb97697c4eab45c5cb -MD5 b4f113715b6d3e3a95bf5cb2e4ba49c0 otcl-1.8-r3.ebuild 1409 -RMD160 503db566fe326e93db41e7b3a20b8a62dc5efb82 otcl-1.8-r3.ebuild 1409 -SHA256 e648941ad4f0a45086b86655debd0c161fe75ab819926ceb97697c4eab45c5cb otcl-1.8-r3.ebuild 1409 -EBUILD otcl-1.9.ebuild 1464 RMD160 c71bfc84836e897bb987334e2ffc39ad6bf8d180 SHA1 a7c5bcbb247a7bb83a3628397da168ca7408b58a SHA256 4ae9a91aef3edb26f8b5e30bacfe00b469e1460e604423ee208c3f792df45829 -MD5 0d650a4e21e7e79117ce577c3f11c40e otcl-1.9.ebuild 1464 -RMD160 c71bfc84836e897bb987334e2ffc39ad6bf8d180 otcl-1.9.ebuild 1464 -SHA256 4ae9a91aef3edb26f8b5e30bacfe00b469e1460e604423ee208c3f792df45829 otcl-1.9.ebuild 1464 -MISC ChangeLog 3309 RMD160 07d653c1794d804868df816d1ec5ab9cd55d4b02 SHA1 292176bae9770cfcafe35600b24ac0a257299787 SHA256 a781b3b42bfd2068f5da06914ff286c98670e610cc3c432ede9ccb4df133fc39 -MD5 e450a18a7eaac11c11157d634ecc09f6 ChangeLog 3309 -RMD160 07d653c1794d804868df816d1ec5ab9cd55d4b02 ChangeLog 3309 -SHA256 a781b3b42bfd2068f5da06914ff286c98670e610cc3c432ede9ccb4df133fc39 ChangeLog 3309 +EBUILD otcl-1.13.ebuild 1483 RMD160 155e6ae4fb61a8e0b126f251af558a1b572992dd SHA1 6f8af3efe752312525ce4d57e028075dadd99bd0 SHA256 2afa5290e941ce0a4436c9e485d7f24b2bf4f45119e52d4d8de86c707213da4c +MD5 ecd6c6ad90f1610e58195ff13dcca773 otcl-1.13.ebuild 1483 +RMD160 155e6ae4fb61a8e0b126f251af558a1b572992dd otcl-1.13.ebuild 1483 +SHA256 2afa5290e941ce0a4436c9e485d7f24b2bf4f45119e52d4d8de86c707213da4c otcl-1.13.ebuild 1483 +MISC ChangeLog 3581 RMD160 78411a6dcb5b67f73342e47c49ed3e2d59f457ff SHA1 edaf86dc8381372f21084decdc8125e0b01d652c SHA256 c822bcf89ffa0615b77e96bb74f1598b59d4fbe945cd9eb182575744010477d3 +MD5 ba1d0801f5e0cde92dba16397ab14303 ChangeLog 3581 +RMD160 78411a6dcb5b67f73342e47c49ed3e2d59f457ff ChangeLog 3581 +SHA256 c822bcf89ffa0615b77e96bb74f1598b59d4fbe945cd9eb182575744010477d3 ChangeLog 3581 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158 @@ -36,9 +31,6 @@ SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata MD5 e6f812ac024e0ea93b344172e672d290 files/digest-otcl-1.11 229 RMD160 eee55ba48d07431b6bccd1bfda54040e3342d5d9 files/digest-otcl-1.11 229 SHA256 b3cbba0c87847c8c2e8af4cb673e3d9d006113c7216dedfd146ecd8958619eec files/digest-otcl-1.11 229 -MD5 f25750821fef1546713afbcff8997e99 files/digest-otcl-1.8-r3 226 -RMD160 8643cea69a08e2481dd76dc2c5427e202bbda179 files/digest-otcl-1.8-r3 226 -SHA256 450999f2531def9f51c66c4152cd13c21a3f663dfc05a33af410a078fcca9ac3 files/digest-otcl-1.8-r3 226 -MD5 84127f056d34e6ca7a0952a7ebe743a2 files/digest-otcl-1.9 226 -RMD160 56914304f2072fcf661527a618a7717a5df53b2c files/digest-otcl-1.9 226 -SHA256 a84039e6b60fa46956af80cd4dfbf8d392f7ed9066f0b3390412cc8d0247c50a files/digest-otcl-1.9 226 +MD5 7e9acee410588f2f3c31c22819d6c7b3 files/digest-otcl-1.13 241 +RMD160 425a570c0ceeeeb018f224761a2c416a2bf15fcb files/digest-otcl-1.13 241 +SHA256 63f6c540d917e2c02031f1a87466c5763dbcbffbde5cf396d2a9797e5202bafc files/digest-otcl-1.13 241 diff --git a/dev-tcltk/otcl/files/digest-otcl-1.13 b/dev-tcltk/otcl/files/digest-otcl-1.13 new file mode 100644 index 000000000000..8c43f1b6462b --- /dev/null +++ b/dev-tcltk/otcl/files/digest-otcl-1.13 @@ -0,0 +1,3 @@ +MD5 f3e4864445429506397b720c7232e4c6 otcl-src-1.13.tar.gz 317440 +RMD160 7c0def77993ec6e48e4085d6a953b55c2fe2bc59 otcl-src-1.13.tar.gz 317440 +SHA256 23b3b7a88fd5a7bfe9f91fd0afd0ac85981c1c2ff0cae6714aee54f7f38ab25d otcl-src-1.13.tar.gz 317440 diff --git a/dev-tcltk/otcl/files/digest-otcl-1.8-r3 b/dev-tcltk/otcl/files/digest-otcl-1.8-r3 deleted file mode 100644 index 8b1ca155a68e..000000000000 --- a/dev-tcltk/otcl/files/digest-otcl-1.8-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 88a4b94b3a128867d3fe13b77f3b5496 otcl-1.8.tar.gz 300954 -RMD160 2627e6a8d58bd7377c1cc9c4be34b463ad0d492a otcl-1.8.tar.gz 300954 -SHA256 31e92bfcd57b3bf9b972219361b91db22ff2c7b4c7d18be80e93b7d00b13079b otcl-1.8.tar.gz 300954 diff --git a/dev-tcltk/otcl/files/digest-otcl-1.9 b/dev-tcltk/otcl/files/digest-otcl-1.9 deleted file mode 100644 index ca8f9368b4e8..000000000000 --- a/dev-tcltk/otcl/files/digest-otcl-1.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d17331ef65912f43c530c57565f85600 otcl-1.9.tar.gz 309728 -RMD160 f3021de27b40abbc6eb805a29b5facaa136e7167 otcl-1.9.tar.gz 309728 -SHA256 3c5ca1d8f1c3fce788371a2b30b63e2f0b51f8c359672f78b101418786cbd09e otcl-1.9.tar.gz 309728 diff --git a/dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch b/dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch new file mode 100644 index 000000000000..6ac498b6758a --- /dev/null +++ b/dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch @@ -0,0 +1,272 @@ +diff -Naur otcl-1.13.orig/conf/configure.in.audio otcl-1.13/conf/configure.in.audio +--- otcl-1.13.orig/conf/configure.in.audio 1998-07-17 15:07:29.000000000 +0900 ++++ otcl-1.13/conf/configure.in.audio 2007-04-28 09:49:05.000000000 +0900 +@@ -90,10 +90,10 @@ + fi + fi + +-AC_TEST_CPP([#include ], x=audio/audio-sun.o, x="") ++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])],[x=audio/audio-sun.o],[x=""]) + V_OBJ_AUDIO="$V_OBJ_AUDIO $x" + +-AC_TEST_CPP([#include ], x=audio/audio-sun.o, x="") ++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])],[x=audio/audio-sun.o],[x=""]) + V_OBJ_AUDIO="$V_OBJ_AUDIO $x" + + case "$target" in +diff -Naur otcl-1.13.orig/conf/configure.in.dynamic otcl-1.13/conf/configure.in.dynamic +--- otcl-1.13.orig/conf/configure.in.dynamic 2006-09-28 14:25:04.000000000 +0900 ++++ otcl-1.13/conf/configure.in.dynamic 2007-04-28 09:58:25.000000000 +0900 +@@ -148,7 +148,7 @@ + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + if test "$have_dl" = yes; then +- SHLIB_LD="${CC} -shared" ++ SHLIB_LD="${CC} -shared -Wl,-soname,${@}" + DL_LIBS="-ldl" + DL_LD_FLAGS="-rdynamic" + DL_LD_SEARCH_FLAGS="" +@@ -311,7 +311,7 @@ + hold_ldflags=$LDFLAGS + AC_MSG_CHECKING(for ld accepts -Bexport flag) + LDFLAGS="${LDFLAGS} -Wl,-Bexport" +- AC_TRY_LINK(, [int i;], found=yes, found=no) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],[found=yes],[found=no]) + LDFLAGS=$hold_ldflags + AC_MSG_RESULT($found) + if test $found = yes; then +diff -Naur otcl-1.13.orig/conf/configure.in.head otcl-1.13/conf/configure.in.head +--- otcl-1.13.orig/conf/configure.in.head 2001-04-12 08:49:06.000000000 +0900 ++++ otcl-1.13/conf/configure.in.head 2007-04-28 09:49:05.000000000 +0900 +@@ -32,12 +32,12 @@ + fi + + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + + AC_PROG_CC + AC_PROG_CXX +-AC_STDC_HEADERS +-AC_HAVE_HEADERS(string.h) ++AC_HEADER_STDC([]) ++AC_CHECK_HEADERS([string.h]) + + V_INCLUDE="" + V_LIB="" +@@ -76,8 +76,7 @@ + else + if test "$CC" = gcc ; then + AC_MSG_CHECKING(that $CXX can handle -O2) +- AC_TRY_COMPILE(, +- #if __GNUC__ < 2 || __GNUC_MINOR__ < 8 ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#if __GNUC__ < 2 || __GNUC_MINOR__ < 8 + /* gcc */ + error + #endif +@@ -85,9 +84,9 @@ + /* egcs */ + int error; + #endif +- ,AC_MSG_RESULT(yes) +- OonS="-O2", # Optimize on Steroids +- AC_MSG_RESULT(no)) ++ ]])],[AC_MSG_RESULT(yes) ++ OonS="-O2"],[# Optimize on Steroids ++ AC_MSG_RESULT(no)]) + fi + fi + +@@ -152,19 +151,16 @@ + + # Checking validity of STL + AC_MSG_CHECKING(standard STL is available) +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS ++ ++AC_LANG_PUSH([C++]) + enable_stl="no" +-AC_TRY_COMPILE( +- #include ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + #include + template class tlist : public list <_T> {}; +- , +- return 0; +- ,AC_MSG_RESULT(yes) +- enable_stl="yes", +- AC_MSG_RESULT(no)) +-AC_LANG_RESTORE ++ ]], [[return 0; ++ ]])],[AC_MSG_RESULT(yes) ++ enable_stl="yes"],[AC_MSG_RESULT(no)]) ++AC_LANG_POP([C++]) + + # This can be extended to support compilation-time module selection + V_STLOBJ="" +diff -Naur otcl-1.13.orig/conf/configure.in.int64_t otcl-1.13/conf/configure.in.int64_t +--- otcl-1.13.orig/conf/configure.in.int64_t 2005-09-01 10:54:05.000000000 +0900 ++++ otcl-1.13/conf/configure.in.int64_t 2007-04-28 09:49:05.000000000 +0900 +@@ -22,19 +22,17 @@ + fi + + AC_CACHE_CHECK([for __int64_t],int64_t_HAVE___INT64_T,[ +-AC_TRY_RUN([ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); } +-], +-int64_t_HAVE___INT64_T=yes,int64_t_HAVE___INT64_T=no,int64_t_HAVE___INT64_T=cross)]) ++]])],[int64_t_HAVE___INT64_T=yes],[int64_t_HAVE___INT64_T=no],[int64_t_HAVE___INT64_T=cross])]) + if test x"$int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then + INT64_T_ALTERNATIVE=__int64_t + fi + + AC_CACHE_CHECK([for long long],int64_t_HAVE_LONG_LONG,[ +-AC_TRY_RUN([ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + main() { long long x; exit (sizeof(x) >= 8 ? 0 : 1); } +-], +-int64_t_HAVE_LONG_LONG=yes,int64_t_HAVE_LONG_LONG=no,int64_t_HAVE_LONG_LONG=cross)]) ++]])],[int64_t_HAVE_LONG_LONG=yes],[int64_t_HAVE_LONG_LONG=no],[int64_t_HAVE_LONG_LONG=cross])]) + if test x"$int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then + INT64_T_ALTERNATIVE="long long" + fi +diff -Naur otcl-1.13.orig/conf/configure.in.nse otcl-1.13/conf/configure.in.nse +--- otcl-1.13.orig/conf/configure.in.nse 2000-03-10 10:49:32.000000000 +0900 ++++ otcl-1.13/conf/configure.in.nse 2007-04-28 09:49:05.000000000 +0900 +@@ -9,20 +9,20 @@ + dnl + + AC_MSG_CHECKING([for struct ether_header]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +-], [ ++]], [[ + int main() + { + struct ether_header etherHdr; + + return 1; + } +-], [ ++]])],[ + AC_DEFINE(HAVE_ETHER_HEADER_STRUCT) + AC_MSG_RESULT(found) +-], [ ++],[ + AC_MSG_RESULT(not found) + ]) + +@@ -31,20 +31,20 @@ + dnl Look for ether_addr + dnl + AC_MSG_CHECKING([for struct ether_addr]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +-], [ ++]], [[ + int main() + { + struct ether_addr etherAddr; + + return 0; + } +-], [ ++]])],[ + AC_DEFINE(HAVE_ETHER_ADDRESS_STRUCT) + AC_MSG_RESULT(found) +-], [ ++],[ + AC_MSG_RESULT(not found) + ]) + +@@ -57,14 +57,13 @@ + dnl + dnl look for SIOCGIFHWADDR + dnl +-AC_TRY_RUN( +-#include ++AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + #include + int main() + { + int i = SIOCGIFHWADDR; + return 0; + } +-, AC_DEFINE(HAVE_SIOCGIFHWADDR), , echo 1 +-) ++]])],[AC_DEFINE(HAVE_SIOCGIFHWADDR)],[],[echo 1 ++]) + +diff -Naur otcl-1.13.orig/conf/configure.in.perl otcl-1.13/conf/configure.in.perl +--- otcl-1.13.orig/conf/configure.in.perl 1999-01-22 11:37:20.000000000 +0900 ++++ otcl-1.13/conf/configure.in.perl 2007-04-28 09:49:05.000000000 +0900 +@@ -19,8 +19,8 @@ + dnl + AC_DEFUN(CHECK_PERL_VERSION, + [ +-echo $[$1] -e "require $[$2]" 1>&AC_FD_CC +-if $[$1] -e "require $[$2]" 2>&AC_FD_CC ++echo $[$1] -e "require $[$2]" 1>&AS_MESSAGE_LOG_FD() ++if $[$1] -e "require $[$2]" 2>&AS_MESSAGE_LOG_FD() + then + : good version + else +diff -Naur otcl-1.13.orig/conf/configure.in.tail otcl-1.13/conf/configure.in.tail +--- otcl-1.13.orig/conf/configure.in.tail 2000-11-14 11:15:01.000000000 +0900 ++++ otcl-1.13/conf/configure.in.tail 2007-04-28 09:49:05.000000000 +0900 +@@ -144,7 +144,8 @@ + + dnl backwards compability---if nothing else, do Makefile + define([AcOutputFiles],ifdef([AcOutputFiles],AcOutputFiles,Makefile)) +-AC_OUTPUT(AcOutputFiles) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT + + if test ! -d gen ; then + echo "creating ./gen" +diff -Naur otcl-1.13.orig/conf/configure.in.tcl otcl-1.13/conf/configure.in.tcl +--- otcl-1.13.orig/conf/configure.in.tcl 2007-02-19 07:16:52.000000000 +0900 ++++ otcl-1.13/conf/configure.in.tcl 2007-04-28 09:50:03.000000000 +0900 +@@ -91,6 +91,9 @@ + $d/include/tcl$TCL_ALT_VERS \ + $d/include \ + /usr/local/include \ ++ $d/lib/tcl$TCL_HI_VERS/include \ ++ $d/lib/tcl$TCL_VERS/include \ ++ $d/lib/tcl$TCL_ALT_VERS/include \ + " + TCL_H_PLACES=" \ + ../include \ +@@ -144,7 +147,14 @@ + /usr/include/tcl$TCL_VERS \ + /usr/include/tcl$TCL_HI_VERS \ + /usr/include/tcl$TCL_ALT_VERS \ +- /usr/include/tcl" ++ /usr/include/tcl \ ++ /usr/lib/tcl$TCL_VERS/include/unix \ ++ /usr/lib/tcl$TCL_HI_VERS/include/unix \ ++ /usr/lib/tcl$TCL_ALT_VERS/include/unix \ ++ /usr/lib/tcl$TCL_VERS/include/generic \ ++ /usr/lib/tcl$TCL_HI_VERS/include/generic \ ++ /usr/lib/tcl$TCL_ALT_VERS/include/generic \ ++ " + dnl /usr/include/tcl is for Debian Linux + dnl /usr/include/tcl-private/generic is for FC 4 + TCL_LIB_PLACES_D="$d \ +diff -Naur otcl-1.13.orig/conf/configure.in.x11 otcl-1.13/conf/configure.in.x11 +--- otcl-1.13.orig/conf/configure.in.x11 2006-09-28 14:25:04.000000000 +0900 ++++ otcl-1.13/conf/configure.in.x11 2007-04-28 09:49:05.000000000 +0900 +@@ -34,7 +34,7 @@ + + echo "checking for X11 header files" + if test "$x_includes" = NONE ; then +- AC_TEST_CPP([#include ],x_includes="",x_includes=NONE) ++ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])],[x_includes=""],[x_includes=NONE]) + if test "$x_includes" = NONE ; then + for i in $xincdirs ; do + if test -r $i/X11/Intrinsic.h; then diff --git a/dev-tcltk/otcl/files/otcl-1.8-badfreefix.patch b/dev-tcltk/otcl/files/otcl-1.8-badfreefix.patch deleted file mode 100644 index 93b39be3c5d3..000000000000 --- a/dev-tcltk/otcl/files/otcl-1.8-badfreefix.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -ur otcl-1.8/otcl.c otcl-1.8.new/otcl.c ---- otcl-1.8/otcl.c 2004-01-05 16:56:07.000000000 -0800 -+++ otcl-1.8.new/otcl.c 2004-01-13 04:12:10.000000000 -0800 -@@ -290,7 +290,7 @@ - if (!l) return 0; - if (l->cl == s) { - *sl = l->next; -- ckfree((char*)l); -+ ckfree((char*)l); l = NULL; - return 1; - } - while (l->next && l->next->cl != s) l = l->next; -@@ -417,18 +417,18 @@ - args[2] = cl ? Tcl_GetCommandName(in, cl->object.id) : ""; - for (i = 1; i < argc; i++) args[i+2] = argv[i]; - -- /* -+ /* - printf("%d ", argc); - for (i = 0; i < argc; i++) - printf("%s ", argv[i]); - printf("\n"); -- */ -- /* -+ -+ - for (i = 0; i < argc + 2; i++) - printf("%s ", args[i]); - printf("\n"); -- */ -- -+ */ -+ - result = (*proc)(cp, in, argc+2, args); - /* this adds to the stack trace */ - if (result == TCL_ERROR) { -@@ -442,7 +442,7 @@ - old_args2, argv[1], in->errorLine); - compat_Tcl_AddObjErrorInfo(in, msg, -1); - } -- if (argc+2 > OTCLSMALLARGS) { ckfree((char*)args); args = 0; } -+ if (argc+2 > OTCLSMALLARGS) { ckfree((char*)args); args = NULL; } - return result; - } - -@@ -479,7 +479,7 @@ - cl ? args[2] : argv[0], in->errorLine); - compat_Tcl_AddObjErrorInfo(in, msg, -1); - } -- if (argc+3 > OTCLSMALLARGS) { ckfree((char*)args); args = 0; } -+ if (argc+3 > OTCLSMALLARGS) { ckfree((char*)args); args = NULL; } - return result; - } - -@@ -500,7 +500,7 @@ - - static void - AutoLoaderDP(ClientData cd) { -- ckfree((char*)cd); -+ ckfree((char*)cd); cd = NULL; - } - - static int -@@ -579,8 +579,8 @@ - Tcl_HashEntry *hPtr = Tcl_FindHashEntry(methods, nm); - if (hPtr != 0) { - Tcl_CmdInfo* co = (Tcl_CmdInfo*)Tcl_GetHashValue(hPtr); -- if (co->deleteProc != 0) (*co->deleteProc)(co->deleteData); -- ckfree((char*)co); -+ if (co->deleteProc != 0) { (*co->deleteProc)(co->deleteData); } co->deleteProc = NULL; -+ ckfree((char*)co); co = NULL; - Tcl_DeleteHashEntry(hPtr); - return 1; - } -@@ -614,7 +614,7 @@ - (Tcl_Namespace*)NULL, 0); - if (cmd) - Tcl_DeleteCommandFromToken(pdpd->interp, cmd); -- ckfree((char*)pdpd); -+ ckfree((char*)pdpd); pdpd = NULL; - } - #endif - -@@ -674,7 +674,7 @@ - - for (i = 0; i < argc; i++) - Tcl_DecrRefCount(objv[i]); -- ckfree((char *)objv); -+ ckfree((char *)objv); objv = NULL; - - #else /* TCL_MAJOR_VERSION < 8 */ - -@@ -691,7 +691,7 @@ - - #endif /* TCL_MAJOR_VERSION < 8 */ - -- ckfree((char*)nargs); -+ ckfree((char*)nargs); nargs = NULL; - argv[1] = name; - argv[2] = oargs; - -@@ -926,7 +926,7 @@ - static void - PrimitiveODestroy(ClientData cd) { - PrimitiveODestroyNoFree(cd); -- ckfree((char*)cd); -+ ckfree((char*)cd); cd = NULL; - } - - static void -@@ -1002,18 +1002,18 @@ - Tcl_CmdInfo* co = (Tcl_CmdInfo*)Tcl_GetHashValue(hp2); - ClientData cdest = cd; - if (co->clientData != 0) cdest = co->clientData; -- if (co->deleteProc != 0) (*co->deleteProc)(co->deleteData); -- ckfree((char*)co); -+ if (co->deleteProc != 0) { (*co->deleteProc)(co->deleteData); } co->deleteProc = NULL; -+ ckfree((char*)co); co = NULL; - } - if (obj->procs) { -- Tcl_DeleteHashTable(obj->procs); ckfree((char*)(obj->procs)); -+ Tcl_DeleteHashTable(obj->procs); ckfree((char*)(obj->procs)); obj->procs = NULL; - } - - (void)RemoveInstance(obj, obj->cl); - - #if TCL_MAJOR_VERSION >= 8 -- ckfree((char*)(obj->variables.procPtr)); -- ckfree((char*)(obj->variables.varTablePtr)); -+ ckfree((char*)(obj->variables.procPtr)); obj->variables.procPtr = NULL; -+ ckfree((char*)(obj->variables.varTablePtr)); obj->variables.varTablePtr = NULL; - #endif - } - -@@ -1035,8 +1035,7 @@ - obj->id = Tcl_CreateCommand(in, name, OTclDispatch, (ClientData)obj, - PrimitiveODestroy); - } else { -- ckfree((char *)obj); -- obj = NULL; -+ ckfree((char *)obj); obj = NULL; - } - #endif - return obj; -@@ -1123,14 +1122,14 @@ - Tcl_CmdInfo* co = (Tcl_CmdInfo*)Tcl_GetHashValue(hPtr); - ClientData cdest = cd; - if (co->clientData != 0) cdest = co->clientData; -- if (co->deleteProc != 0) (*co->deleteProc)(co->deleteData); -- ckfree((char*)co); -+ if (co->deleteProc != 0) { (*co->deleteProc)(co->deleteData); } co->deleteProc = NULL; -+ ckfree((char*)co); co = NULL; - } - Tcl_DeleteHashTable(&cl->instprocs); - - if (cl->objectdata) { - Tcl_DeleteHashTable(cl->objectdata); -- ckfree((char*)(cl->objectdata)); cl->objectdata = 0; -+ ckfree((char*)(cl->objectdata)); cl->objectdata = NULL; - } - - /* -@@ -1151,7 +1150,7 @@ - * PrimitiveODestory to destory the hash entries first */ - PrimitiveODestroyNoFree(cd); - Tcl_DeleteHashTable(&cl->instances); -- ckfree((char*)cd); -+ ckfree((char*)cd); cd = NULL; - } - - -@@ -1176,8 +1175,7 @@ - obj->id = Tcl_CreateCommand(in, name, OTclDispatch, (ClientData)cl, - PrimitiveCDestroy); - } else { -- ckfree((char *)cl); -- cl = NULL; -+ ckfree((char *)cl); cl = NULL; - } - #endif - return cl; -@@ -1359,6 +1357,9 @@ - OTclObject* obj = OTclAsObject(in, cd); - Tcl_CmdInfo proc; - int op; -+ // NULL out the deleteProc value -+ // as it may be filled with random data on variable creation -+ proc.deleteProc = NULL; proc.deleteData = NULL; - - if (!obj) return OTclErrType(in, argv[0], "Object"); - if (argc != 7) return OTclErrArgCnt(in,argv[0],"proc name args body"); -@@ -1488,7 +1489,7 @@ - Tcl_AppendResult(in, "expected ?inst/local? or ?inst? ?local? but got ", - argv[i]); - } -- ckfree((char*)av); -+ ckfree((char*)av); av = NULL; - if (result != TCL_OK) break; - } - return result; -@@ -1594,10 +1595,10 @@ - scl[i] = OTclGetClass(in, av[i]); - loaded = (scl[i] != 0); - } -- ckfree(args); -+ ckfree(args); args = NULL; - if (!loaded) { -- ckfree((char*)av); -- ckfree((char*)scl); -+ ckfree((char*)av); av = NULL; -+ ckfree((char*)scl); scl = NULL; - return OTclErrBadVal(in, "a list of classes", argv[4]); - } - } -@@ -1621,8 +1622,8 @@ - } - - if (reversed != 0) { -- ckfree((char*)av); -- ckfree((char*)scl); -+ ckfree((char*)av); av = NULL; -+ ckfree((char*)scl); scl = NULL; - return OTclErrBadVal(in, "classes in dependence order", argv[4]); - } - -@@ -1641,8 +1642,8 @@ - } - for (i = 0; i < ac; i++) - AddSuper(cl, scl[i]); -- ckfree((char*)av); -- ckfree((char*)scl); -+ ckfree((char*)av); av = NULL; -+ ckfree((char*)scl); scl = NULL; - FlushPrecedences(cl); - - if (!ComputePrecedence(cl)) { -@@ -1784,17 +1785,25 @@ - OTclClass* cl = OTclAsClass(in, cd); - Tcl_CmdInfo proc; - int op; -+ // NULL out the deleteProc value -+ // as it may be filled with random data on variable creation -+ proc.deleteProc = NULL; proc.deleteData = NULL; - - if (!cl) return OTclErrType(in, argv[0], "Class"); - if (argc != 7) return OTclErrArgCnt(in,argv[0],"instproc name args body"); - -+ - /* - * if the args list is "auto", the body is a script to load the proc - */ - -- if (!strcmp("auto", argv[5])) op = MakeAuto(&proc, argv[6]); -- else if (argv[5][0]==0 && argv[6][0]==0) op = -1; -- else op = MakeProc(&proc,in, argc-3, argv+3); -+ if (!strcmp("auto", argv[5])) { -+ op = MakeAuto(&proc, argv[6]); -+ } else if (argv[5][0]==0 && argv[6][0]==0) { -+ op = -1; -+ } else { -+ op = MakeProc(&proc,in, argc-3, argv+3); -+ } - - (void)RemoveMethod(&cl->instprocs, argv[4], (ClientData)cl); - if (op == 1) AddMethod(&cl->instprocs, argv[4], proc.proc, diff --git a/dev-tcltk/otcl/otcl-1.9.ebuild b/dev-tcltk/otcl/otcl-1.13.ebuild similarity index 56% rename from dev-tcltk/otcl/otcl-1.9.ebuild rename to dev-tcltk/otcl/otcl-1.13.ebuild index acfe014bfbec..69b8e33c99fa 100644 --- a/dev-tcltk/otcl/otcl-1.9.ebuild +++ b/dev-tcltk/otcl/otcl-1.13.ebuild @@ -1,37 +1,37 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/otcl-1.9.ebuild,v 1.3 2006/03/28 16:30:26 exg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/otcl-1.13.ebuild,v 1.1 2007/04/28 03:35:12 matsuu Exp $ -inherit eutils +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" +inherit eutils autotools virtualx + +MY_P="${PN}-src-${PV}" DESCRIPTION="MIT Object extension to Tcl" HOMEPAGE="http://otcl-tclcl.sourceforge.net/otcl/" -SRC_URI="mirror://sourceforge/otcl-tclcl/${P}.tar.gz" +SRC_URI="mirror://sourceforge/otcl-tclcl/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~x86 ~sparc ~ppc ~amd64" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="" -DEPEND=">=dev-lang/tcl-8.3.2 - >=dev-lang/tk-8.3.2" +DEPEND=">=dev-lang/tcl-8.4.5 + >=dev-lang/tk-8.4.5" +# the package is not safe :-( MAKEOPTS="${MAKEOPTS} -j1" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/otcl-1.8-badfreefix.patch - - sed -i -e "s/relid'/relid/" "${S}"/configure || die + cd "${S}" - sed -i \ - -e "s/) otkAppInit.c/) otkAppInit.c otcl.c/" \ - -e "s/) otclAppInit.c/) otclAppInit.c otcl.c/" \ - ${S}/Makefile.in || die "sed Makefile failed" + epatch "${FILESDIR}"/${PN}-1.11-badfreefix.patch + epatch "${FILESDIR}"/${P}-configure-cleanup.patch - libtoolize -f + eautoreconf } src_compile() { @@ -41,9 +41,10 @@ src_compile() { myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}" CFLAGS="${CFLAGS} -I/usr/$(get_libdir)/tcl${tkv}/include/generic" + echo myconf $myconf econf ${myconf} || die "econf failed" emake all || die "emake all failed" - emake libotcl.so || die "emake libotcl.so failed" + emake libotcl.so || die "emake libotcl.so failed" } src_install() { @@ -59,3 +60,7 @@ src_install() { docinto doc dohtml doc/*.html } + +src_test() { + Xmake test +} diff --git a/dev-tcltk/otcl/otcl-1.8-r3.ebuild b/dev-tcltk/otcl/otcl-1.8-r3.ebuild deleted file mode 100644 index 52b44cc13d2c..000000000000 --- a/dev-tcltk/otcl/otcl-1.8-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/otcl-1.8-r3.ebuild,v 1.5 2005/04/24 12:30:27 matsuu Exp $ - -inherit eutils - -DESCRIPTION="MIT Object extension to Tcl" -SF_PN="otcl-tclcl" -HOMEPAGE="http://sourceforge.net/projects/${SF_PN}/" -SRC_URI="mirror://sourceforge/${SF_PN}/${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="x86 sparc ~ppc amd64" -IUSE="" -DEPEND=">=dev-lang/tcl-8.3.2 - >=dev-lang/tk-8.3.2" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/otcl-1.8-badfreefix.patch - libtoolize -f -} - -src_compile() { - local tclv tkv myconf - tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/') - tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') - myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}" - CFLAGS="${CFLAGS} -I/usr/lib/tcl${tkv}/include/generic" - - sed -i \ - -e "s/) otkAppInit.c/) otkAppInit.c otcl.c/" \ - -e "s/) otclAppInit.c/) otclAppInit.c otcl.c/" \ - -e "" "${S}/Makefile.in" \ - || die "sed Makefile failed" - - econf ${myconf} || die "econf failed" - emake all || die "emake all failed" - emake libotcl.so || die "emake libotcl.so failed" -} - -src_install() { - into /usr - dobin otclsh owish - dolib libotcl.so - dolib.a libotcl.a - insinto /usr/include - doins otcl.h - - # docs - dodoc VERSION - dohtml README.html CHANGES.html - docinto doc - dodoc doc/* -} -- 2.26.2