Revision: 110496 https://trac.macports.org/changeset/110496 Author: blair@macports.org Date: 2013-08-31 11:19:02 -0700 (Sat, 31 Aug 2013) Log Message: ----------- zeroc-ice33: rename patch file to match what it patches. Modified Paths: -------------- trunk/dports/devel/zeroc-ice33/Portfile Added Paths: ----------- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.cpp.diff Removed Paths: ------------- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.diff Modified: trunk/dports/devel/zeroc-ice33/Portfile =================================================================== --- trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 18:08:24 UTC (rev 110495) +++ trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 18:19:02 UTC (rev 110496) @@ -45,7 +45,7 @@ patch-ice.cpp.src.IceSSL.Instance.cpp.diff \ patch-ice.cpp.src.Slice.Preprocessor.cpp.diff \ patch-ice.cpp.src.slice2cpp.Gen.cpp.diff \ - patch-ice.cpp.src.slice2html.Gen.diff \ + patch-ice.cpp.src.slice2html.Gen.cpp.diff \ patch-clang-support.diff platforms darwin Copied: trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.cpp.diff (from rev 110495, trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.diff) =================================================================== --- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.cpp.diff (rev 0) +++ trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.cpp.diff 2013-08-31 18:19:02 UTC (rev 110496) @@ -0,0 +1,152 @@ +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(); Deleted: trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.diff =================================================================== --- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.diff 2013-08-31 18:08:24 UTC (rev 110495) +++ trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2html.Gen.diff 2013-08-31 18:19:02 UTC (rev 110496) @@ -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();