Revision: 111741 https://trac.macports.org/changeset/111741 Author: ryandesign@macports.org Date: 2013-09-30 07:45:03 -0700 (Mon, 30 Sep 2013) Log Message: ----------- collada-dom: remove unused patchfiles Removed Paths: ------------- trunk/dports/science/collada-dom/files/patch-src-dae-daeUtils.cpp.diff trunk/dports/science/collada-dom/files/patch-test-1.4-domTest.cpp.diff trunk/dports/science/collada-dom/files/patch-test-1.5-domTest.cpp.diff Deleted: trunk/dports/science/collada-dom/files/patch-src-dae-daeUtils.cpp.diff =================================================================== --- trunk/dports/science/collada-dom/files/patch-src-dae-daeUtils.cpp.diff 2013-09-30 14:19:33 UTC (rev 111740) +++ trunk/dports/science/collada-dom/files/patch-src-dae-daeUtils.cpp.diff 2013-09-30 14:45:03 UTC (rev 111741) @@ -1,26 +0,0 @@ ---- src/dae/daeUtils.cpp.orig 2010-02-03 05:00:28.000000000 +0100 -+++ src/dae/daeUtils.cpp 2010-02-03 05:02:40.000000000 +0100 -@@ -11,6 +11,9 @@ - #include <dae/daeUtils.h> - #include <dae/daeURI.h> - -+#include <unistd.h> -+#include <sys/syslimits.h> -+ - #ifdef _WIN32 - #include <direct.h> // for getcwd (windows) - #else -@@ -149,7 +152,12 @@ - #elif defined(__linux__) || defined(__linux) - static string tmpDir = "/tmp/"; - #elif defined __APPLE_CC__ --static string tmpDir = string(getenv("TMPDIR")); -+ static string tmpDir = ""; -+ if (tmpDir == "") { -+ char tmp[PATH_MAX]; -+ confstr(_CS_DARWIN_USER_TEMP_DIR, tmp, sizeof(tmp)); -+ tmpDir = tmp; -+ } - #elif defined __CELLOS_LV2__ - #error tmp dir for your system unknown - #else Deleted: trunk/dports/science/collada-dom/files/patch-test-1.4-domTest.cpp.diff =================================================================== --- trunk/dports/science/collada-dom/files/patch-test-1.4-domTest.cpp.diff 2013-09-30 14:19:33 UTC (rev 111740) +++ trunk/dports/science/collada-dom/files/patch-test-1.4-domTest.cpp.diff 2013-09-30 14:45:03 UTC (rev 111741) @@ -1,53 +0,0 @@ ---- test/1.4/domTest.cpp.orig 2011-08-04 19:19:41.000000000 -0500 -+++ test/1.4/domTest.cpp 2011-08-04 19:22:53.000000000 -0500 -@@ -5,6 +5,7 @@ - * http://www.opensource.org/licenses/mit-license.php - * - */ -+#define BOOST_FILESYSTEM_DEPRECATED - #include <cstdarg> - #include <iostream> - #include <iomanip> -@@ -123,15 +124,15 @@ - CheckResult(replace("abc123", "bc12", "b") == "ab3"); - CheckResult(replace("abracadabra", "a", "") == "brcdbr"); - -- CheckResult(tokenize("1|2|3|4", "|") == makeStringList("1", "2", "3", "4", 0)); -- CheckResult(tokenize("|1|", "|") == makeStringList("1", 0)); -- CheckResult(tokenize("1|||2||3|", "|") == makeStringList("1", "2", "3", 0)); -+ CheckResult(tokenize("1|2|3|4", "|") == makeStringList("1", "2", "3", "4", NULL)); -+ CheckResult(tokenize("|1|", "|") == makeStringList("1", NULL)); -+ CheckResult(tokenize("1|||2||3|", "|") == makeStringList("1", "2", "3", NULL)); - CheckResult(tokenize("1|||2||3|", "|", true) == -- makeStringList("1", "|", "|", "|", "2", "|", "|", "3", "|", 0)); -+ makeStringList("1", "|", "|", "|", "2", "|", "|", "3", "|", NULL)); - CheckResult(tokenize("this/is some#text", "/#", true) == -- makeStringList("this", "/", "is some", "#", "text", 0)); -+ makeStringList("this", "/", "is some", "#", "text", NULL)); - CheckResult(tokenize("this/is some#text", "/# ", false) == -- makeStringList("this", "is", "some", "text", 0)); -+ makeStringList("this", "is", "some", "text", NULL)); - - CheckResult(toString(5) == "5"); - CheckResult(toFloat(toString(4.0f)) == 4.0f); -@@ -822,17 +823,17 @@ - daeElement* node = dae.getDatabase()->idLookup("Box").at(0); - - CheckResult(getChildNames(node) == makeStringArray( -- "rotate", "rotate", "rotate", "instance_geometry", 0)); -+ "rotate", "rotate", "rotate", "instance_geometry", NULL)); - - // Place a new <translate> after the first <rotate> using placeElementAfter, and - // make sure the <translate> shows up in the right spot. - node->placeElementAfter(node->getChildren()[0], node->createElement("translate")); - CheckResult(getChildNames(node) == makeStringArray( -- "rotate", "translate", "rotate", "rotate", "instance_geometry", 0)); -+ "rotate", "translate", "rotate", "rotate", "instance_geometry", NULL)); - - node->placeElementBefore(node->getChildren()[0], node->createElement("scale")); - CheckResult(getChildNames(node) == makeStringArray( -- "scale", "rotate", "translate", "rotate", "rotate", "instance_geometry", 0)); -+ "scale", "rotate", "translate", "rotate", "rotate", "instance_geometry", NULL)); - - return testResult(true); - }; Deleted: trunk/dports/science/collada-dom/files/patch-test-1.5-domTest.cpp.diff =================================================================== --- trunk/dports/science/collada-dom/files/patch-test-1.5-domTest.cpp.diff 2013-09-30 14:19:33 UTC (rev 111740) +++ trunk/dports/science/collada-dom/files/patch-test-1.5-domTest.cpp.diff 2013-09-30 14:45:03 UTC (rev 111741) @@ -1,53 +0,0 @@ ---- test/1.5/domTest.cpp.orig 2011-08-04 19:19:49.000000000 -0500 -+++ test/1.5/domTest.cpp 2011-08-04 19:22:48.000000000 -0500 -@@ -5,6 +5,7 @@ - * http://www.opensource.org/licenses/mit-license.php - * - */ -+#define BOOST_FILESYSTEM_DEPRECATED - #include <cstdarg> - #include <iostream> - #include <iomanip> -@@ -124,15 +125,15 @@ - CheckResult(replace("abc123", "bc12", "b") == "ab3"); - CheckResult(replace("abracadabra", "a", "") == "brcdbr"); - -- CheckResult(tokenize("1|2|3|4", "|") == makeStringList("1", "2", "3", "4", 0)); -- CheckResult(tokenize("|1|", "|") == makeStringList("1", 0)); -- CheckResult(tokenize("1|||2||3|", "|") == makeStringList("1", "2", "3", 0)); -+ CheckResult(tokenize("1|2|3|4", "|") == makeStringList("1", "2", "3", "4", NULL)); -+ CheckResult(tokenize("|1|", "|") == makeStringList("1", NULL)); -+ CheckResult(tokenize("1|||2||3|", "|") == makeStringList("1", "2", "3", NULL)); - CheckResult(tokenize("1|||2||3|", "|", true) == -- makeStringList("1", "|", "|", "|", "2", "|", "|", "3", "|", 0)); -+ makeStringList("1", "|", "|", "|", "2", "|", "|", "3", "|", NULL)); - CheckResult(tokenize("this/is some#text", "/#", true) == -- makeStringList("this", "/", "is some", "#", "text", 0)); -+ makeStringList("this", "/", "is some", "#", "text", NULL)); - CheckResult(tokenize("this/is some#text", "/# ", false) == -- makeStringList("this", "is", "some", "text", 0)); -+ makeStringList("this", "is", "some", "text", NULL)); - - CheckResult(toString(5) == "5"); - CheckResult(toFloat(toString(4.0f)) == 4.0f); -@@ -825,17 +826,17 @@ - daeElement* node = dae.getDatabase()->idLookup("Box").at(0); - - CheckResult(getChildNames(node) == makeStringArray( -- "rotate", "rotate", "rotate", "instance_geometry", 0)); -+ "rotate", "rotate", "rotate", "instance_geometry", NULL)); - - // Place a new <translate> after the first <rotate> using placeElementAfter, and - // make sure the <translate> shows up in the right spot. - node->placeElementAfter(node->getChildren()[0], node->createElement("translate")); - CheckResult(getChildNames(node) == makeStringArray( -- "rotate", "translate", "rotate", "rotate", "instance_geometry", 0)); -+ "rotate", "translate", "rotate", "rotate", "instance_geometry", NULL)); - - node->placeElementBefore(node->getChildren()[0], node->createElement("scale")); - CheckResult(getChildNames(node) == makeStringArray( -- "scale", "rotate", "translate", "rotate", "rotate", "instance_geometry", 0)); -+ "scale", "rotate", "translate", "rotate", "rotate", "instance_geometry", NULL)); - - return testResult(true); - };