[67664] trunk/dports/devel/ice-cpp
blair at macports.org
blair at macports.org
Sat May 15 10:29:19 PDT 2010
Revision: 67664
http://trac.macports.org/changeset/67664
Author: blair at macports.org
Date: 2010-05-15 10:29:16 -0700 (Sat, 15 May 2010)
Log Message:
-----------
New upstream 3.4.0 version of Ice. Partially resolves #23963.
1) Regenerated patch-ice.cpp.config.Make.rules.Darwin.diff.
2) Deleted patch-ice.cpp.src.Slice.Preprocessor.cpp.diff and
patch-ice.cpp.src.slice2html.Gen.diff because these patches have
been folded into the new release.
3) Reorder $(CPPFLAGS) and $(READLINE_FLAGS) in some test suite
Makefile's so that the build's include directories are listed
before MacPorts', otherwise the compile can pick up an existing,
older version of Ice and get a compilation failure.
Modified Paths:
--------------
trunk/dports/devel/ice-cpp/Portfile
trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff
Removed Paths:
-------------
trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff
Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile 2010-05-15 17:05:30 UTC (rev 67663)
+++ trunk/dports/devel/ice-cpp/Portfile 2010-05-15 17:29:16 UTC (rev 67664)
@@ -3,8 +3,7 @@
PortSystem 1.0
name ice-cpp
-version 3.3.1
-revision 5
+version 3.4.0
categories devel
maintainers blair
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -30,20 +29,18 @@
other languages: slice2cs, slice2java, slice2py, slice2rb and slice2vb.
homepage http://www.zeroc.com/
-master_sites ${homepage}download/Ice/3.3/
+master_sites ${homepage}download/Ice/3.4/
set ice_dist Ice-${version}${extract.suffix}
distname Ice-${version}
distfiles ${ice_dist}
patchfiles patch-ice.cpp.config.Make.rules.diff \
- patch-ice.cpp.config.Make.rules.Darwin.diff \
- patch-ice.cpp.src.slice2html.Gen.diff \
- patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
+ patch-ice.cpp.config.Make.rules.Darwin.diff
checksums ${ice_dist} \
- md5 1f37dfcec4662fcde030553fb447d064 \
- sha1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa \
- rmd160 d64d52c35640cebe1145e62f57618473d17cbeb5
+ md5 998b10627ade020cb00f5beb73efc0e0 \
+ sha1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 \
+ rmd160 e874749f8d7d1916c1e3b19c006a7f2216e10f53
platforms darwin
depends_lib port:libiconv \
@@ -62,17 +59,19 @@
ui_debug ${cmd}
system ${cmd}
- set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.slice2html.Gen.diff"
- ui_debug ${cmd}
- system ${cmd}
-
- set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff"
- ui_debug ${cmd}
- system ${cmd}
-
reinplace "s/-O2/-g -O2/" \
${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
+ # To prevent a compilation failure by picking up header files
+ # from an older installed version of Ice, put the $(CPPFLAGS)
+ # before $(READLINE_FLAGS).
+ reinplace "s|\$\(READLINE_FLAGS\) \$\(CPPFLAGS\)|\$\(CPPFLAGS\) \$\(READLINE_FLAGS\)|" \
+ ${workpath}/Ice-${version}/cpp/demo/Freeze/library/Makefile \
+ ${workpath}/Ice-${version}/cpp/demo/Freeze/phonebook/Makefile \
+ ${workpath}/Ice-${version}/cpp/demo/book/evictor_filesystem/Makefile \
+ ${workpath}/Ice-${version}/cpp/demo/book/lifecycle/Makefile \
+ ${workpath}/Ice-${version}/cpp/demo/book/map_filesystem/Makefile
+
# It appears that the 10.4 and 10.5 installed versions of
# ${prefix}/include/iconv.h have different definitions of
# the inbuf parameter to iconv(), one is 'const char* * inbuf'
Modified: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2010-05-15 17:05:30 UTC (rev 67663)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2010-05-15 17:29:16 UTC (rev 67664)
@@ -1,6 +1,6 @@
-diff -ru ../Ice-3.3.0.orig/cpp/config/Make.rules.Darwin ./cpp/config/Make.rules.Darwin
---- ../Ice-3.3.0.orig/cpp/config/Make.rules.Darwin 2008-05-16 10:24:00.000000000 -0700
-+++ ./cpp/config/Make.rules.Darwin 2008-05-23 12:39:47.000000000 -0700
+diff -ru ../Ice-3.4.0.orig/cpp/config/Make.rules.Darwin ./cpp/config/Make.rules.Darwin
+--- ../Ice-3.4.0.orig/cpp/config/Make.rules.Darwin 2010-02-25 07:55:41.000000000 -0800
++++ ./cpp/config/Make.rules.Darwin 2010-05-14 22:18:38.000000000 -0700
@@ -11,7 +11,7 @@
# This file is included by Make.rules when uname is Darwin.
#
@@ -8,12 +8,11 @@
-CXX = c++
+CXX ?= c++
- CXXFLAGS = -ftemplate-depth-128 -Wall -D_REENTRANT
+ CXXFLAGS = -Wall -D_REENTRANT
-@@ -84,5 +84,5 @@
- ICE_OS_LIBS = -ldl $(ICONV_LIB)
+@@ -88,4 +88,4 @@
+ ICEUTIL_OS_LIBS = -lpthread
+ ICE_OS_LIBS = -ldl
-
-PLATFORM_HAS_READLINE := no
+PLATFORM_HAS_READLINE := yes
-
Deleted: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff 2010-05-15 17:05:30 UTC (rev 67663)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff 2010-05-15 17:29:16 UTC (rev 67664)
@@ -1,20 +0,0 @@
-diff -r -c -N ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp ./cpp/src/Slice/Preprocessor.cpp
-*** ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp 2009-03-20 15:22:14.000000000 -0230
---- ./cpp/src/Slice/Preprocessor.cpp 2009-05-12 16:18:54.000000000 -0230
-***************
-*** 46,52 ****
-
- Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
- _path(path),
-! _fileName(fileName),
- _args(args),
- _cppHandle(0)
- {
---- 46,52 ----
-
- Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
- _path(path),
-! _fileName(fullPath(fileName)),
- _args(args),
- _cppHandle(0)
- {
Deleted: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff 2010-05-15 17:05:30 UTC (rev 67663)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff 2010-05-15 17:29:16 UTC (rev 67664)
@@ -1,152 +0,0 @@
-diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
-index 4680c57..de13194 100644
---- a/cpp/src/slice2html/Gen.cpp
-+++ b/cpp/src/slice2html/Gen.cpp
-@@ -562,7 +562,7 @@ Slice::GeneratorBase::printMetaData(const ContainedPtr& p)
- }
-
- void
--Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated)
-+Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated, bool forIndex)
- {
- ContainerPtr container = ContainerPtr::dynamicCast(p);
- if(!container)
-@@ -575,7 +575,7 @@ Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& mo
- container = module;
- }
-
-- string summary = getComment(p, container, true, module);
-+ string summary = getComment(p, container, true, forIndex);
- _out << nl << summary;
-
- if(deprecated)
-@@ -2042,7 +2042,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2071,7 +2071,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2092,7 +2092,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2115,7 +2115,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2138,7 +2138,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2161,7 +2161,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2184,7 +2184,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2207,7 +2207,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2230,7 +2230,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
- end();
- }
- end();
-@@ -2427,7 +2427,7 @@ Slice::ExceptionGenerator::generate(const ExceptionPtr& e)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, e, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, e, (*q)->findMetaData("deprecate", metadata), false);
- end();
- }
- end();
-@@ -2557,7 +2557,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
- end();
- }
- end();
-@@ -2578,7 +2578,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
- end();
- }
- end();
-@@ -2739,7 +2739,7 @@ Slice::StructGenerator::generate(const StructPtr& s)
- end();
- start("dd");
- string metadata;
-- printSummary(*q, s, (*q)->findMetaData("deprecate", metadata));
-+ printSummary(*q, s, (*q)->findMetaData("deprecate", metadata), false);
- end();
- }
- end();
-diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
-index 776035b..cacdd58 100644
---- a/cpp/src/slice2html/Gen.h
-+++ b/cpp/src/slice2html/Gen.h
-@@ -52,7 +52,7 @@ protected:
-
- void printComment(const ContainedPtr&, const ContainerPtr&, const ::std::string&, bool = false);
- void printMetaData(const ContainedPtr&);
-- void printSummary(const ContainedPtr&, const ContainerPtr&, bool);
-+ void printSummary(const ContainedPtr&, const ContainerPtr&, bool, bool);
-
- void printHeaderFooter(const ContainedPtr&);
- void printSearch();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100515/9ffd20eb/attachment-0001.html>
More information about the macports-changes
mailing list