<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115110] trunk/dports/archivers/dar</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115110">115110</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-12-24 23:56:10 -0800 (Tue, 24 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>dar: update to 2.4.11 and add patches to fix build on Mavericks (#41890); add lzo2 and libgcrypt dependencies</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsarchiversdarPortfile">trunk/dports/archivers/dar/Portfile</a></li>
<li><a href="#trunkdportsarchiversdarfilespatchdocMakefileindiff">trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsarchiversdarfilespatchclangcompatibilitydiff">trunk/dports/archivers/dar/files/patch-clang-compatibility.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsarchiversdarPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/archivers/dar/Portfile (115109 => 115110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/archivers/dar/Portfile 2013-12-25 07:34:16 UTC (rev 115109)
+++ trunk/dports/archivers/dar/Portfile 2013-12-25 07:56:10 UTC (rev 115110)
</span><span class="lines">@@ -3,8 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name dar
</span><del>-version 2.3.9
-revision 1
</del><ins>+version 2.4.11
</ins><span class="cx"> categories archivers
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -17,15 +16,20 @@
</span><span class="cx"> homepage http://dar.sourceforge.net/
</span><span class="cx"> master_sites sourceforge:project/dar/dar/${version}
</span><span class="cx">
</span><del>-checksums md5 8dcfa94b7bac139cab05291f00c74bd3 \
- sha1 9f49f03aa542c8132383293f3939db2457cc1524 \
- rmd160 4d06885bcb7dc5e64d0e5b1cc61a4f8c711d3fc7
</del><ins>+checksums rmd160 659ea594a33cd9f0e3744b6d3b19ba58c74995e2 \
+ sha256 c15fd11cc339363c25cbf24594eaa571235e00de60b6034a7a58d299ed864a5f
</ins><span class="cx">
</span><span class="cx"> depends_build port:doxygen
</span><span class="cx">
</span><del>-depends_lib port:zlib port:bzip2 port:libiconv \
- port:gettext port:openssl
</del><ins>+depends_lib port:bzip2 \
+ port:gettext \
+ port:libgcrypt \
+ port:libiconv \
+ port:lzo2 \
+ port:openssl \
+ port:zlib
</ins><span class="cx">
</span><del>-patchfiles patch-doc-Makefile.in.diff
</del><ins>+patchfiles patch-doc-Makefile.in.diff \
+ patch-clang-compatibility.diff
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsarchiversdarfilespatchclangcompatibilitydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/archivers/dar/files/patch-clang-compatibility.diff (0 => 115110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/archivers/dar/files/patch-clang-compatibility.diff (rev 0)
+++ trunk/dports/archivers/dar/files/patch-clang-compatibility.diff 2013-12-25 07:56:10 UTC (rev 115110)
</span><span class="lines">@@ -0,0 +1,205 @@
</span><ins>+http://sourceforge.net/p/dar/patches/32/
+--- src/dar_suite/command_line.cpp 2013-08-26 00:02:14.000000000 +0200
++++ src/dar_suite/command_line.cpp 2013-11-16 17:01:55.000000000 +0100
+@@ -778,7 +778,7 @@ static bool get_args_recursive(recursive
+ try
+ {
+ // trying to read a simple integer
+- deci tmp = string(optarg);
++ libdar::deci tmp = string(optarg);
+ p.fixed_date = tmp.computer();
+ }
+ catch(Edeci & e)
+@@ -865,7 +865,7 @@ static bool get_args_recursive(recursive
+ case 'p':
+ if(optarg != NULL)
+ {
+- deci conv = string(optarg);
++ libdar::deci conv = string(optarg);
+ p.pause = conv.computer();
+ }
+ else
+@@ -1244,7 +1244,7 @@ static bool get_args_recursive(recursive
+ {
+ try
+ {
+- p.hourshift = deci(string(optarg)).computer();
++ p.hourshift = libdar::deci(string(optarg)).computer();
+ }
+ catch(Edeci & e)
+ {
+--- src/dar_suite/crit_action_cmd_line.cpp 2013-08-25 19:09:49.000000000 +0200
++++ src/dar_suite/crit_action_cmd_line.cpp 2013-11-16 17:03:59.000000000 +0100
+@@ -412,7 +412,7 @@ static const criterium * criterium_creat
+ case 'r':
+ try
+ {
+- deci tmp = sub_arg;
++ libdar::deci tmp = sub_arg;
+ date = tmp.computer();
+ }
+ catch(Edeci & e)
+--- src/dar_suite/dar_manager.cpp 2013-08-26 00:02:14.000000000 +0200
++++ src/dar_suite/dar_manager.cpp 2013-11-16 17:13:39.000000000 +0100
+@@ -78,7 +78,7 @@ using namespace libdar;
+ #define INVALID_ARG "Invalid argument given to -%c (requires integer)"
+ #define OPT_STRING "C:B:A:lD:b:p:od:ru:f:shVm:vQjw:ie:c@:N;:ka:"
+
+-enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move, interactive, check, batch };
++namespace libdar { enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move, interactive, check, batch }; };
+
+ static S_I little_main(user_interaction & dialog, S_I argc, char *const argv[], const char **env);
+ static bool command_line(user_interaction & dialog,
+@@ -197,7 +197,7 @@ S_I little_main(user_interaction & dialo
+ case used:
+ case files:
+ case stats:
+- case move:
++ case libdar::move:
+ case interactive:
+ case check:
+ case batch:
+@@ -404,7 +404,7 @@ static bool command_line(user_interactio
+ case 'm':
+ if(op != none_op)
+ throw Erange("command_line", tools_printf(gettext(ONLY_ONCE), char(lu)));
+- op = move;
++ op = libdar::move;
+ if(optarg == NULL)
+ throw Erange("command_line", tools_printf(gettext(MISSING_ARG), char(lu)));
+ num = tools_str2int(optarg);
+@@ -466,7 +466,7 @@ static bool command_line(user_interactio
+ {
+ try
+ {
+- deci tmp = string(optarg);
++ libdar::deci tmp = string(optarg);
+ date = tmp.computer();
+ }
+ catch(Edeci & e)
+@@ -555,7 +555,7 @@ static bool command_line(user_interactio
+ break;
+ case options:
+ break;
+- case move:
++ case libdar::move:
+ if(rest.size() != 1)
+ {
+ dialog.warning(gettext("Missing argument to command line, aborting"));
+@@ -1321,7 +1321,7 @@ static void finalize(user_interaction &
+ case where:
+ case options:
+ case dar:
+- case move:
++ case libdar::move:
+ case batch:
+ if(info_details)
+ dialog.warning(gettext("Compressing and writing back database to file..."));
+@@ -1385,7 +1385,7 @@ static void action(user_interaction & di
+ case stats:
+ op_stats(dialog, dat, info_details);
+ break;
+- case move:
++ case libdar::move:
+ op_move(dialog, dat, num, num2, info_details);
+ break;
+ case interactive:
+--- src/dar_suite/dar_xform.cpp 2013-08-26 00:02:14.000000000 +0200
++++ src/dar_suite/dar_xform.cpp 2013-11-16 17:04:25.000000000 +0100
+@@ -342,7 +342,7 @@ static bool command_line(user_interactio
+ case 'p':
+ if(optarg != NULL)
+ {
+- deci conv = string(optarg);
++ libdar::deci conv = string(optarg);
+ pause = conv.computer();
+ }
+ else
+--- src/dar_suite/line_tools.cpp 2013-08-26 00:02:14.000000000 +0200
++++ src/dar_suite/line_tools.cpp 2013-11-16 17:03:30.000000000 +0100
+@@ -221,8 +221,8 @@ void line_tools_repeat_param(const strin
+
+ try
+ {
+- deci x1 = tmp1;
+- deci x2 = tmp2;
++ libdar::deci x1 = tmp1;
++ libdar::deci x2 = tmp2;
+
+ repeat_count = x1.computer();
+ repeat_byte = x2.computer();
+@@ -520,14 +520,14 @@ void line_tools_get_min_digits(string th
+ it1 = tools_find_first_char_of(the_arg, ',');
+ if(it1 == the_arg.end()) // a single number is provided
+ {
+- deci tmp = the_arg;
++ libdar::deci tmp = the_arg;
+ num = tmp.computer();
+ }
+ else // at least two numbers are provided
+ {
+ if(the_arg.begin() != it1)
+ {
+- deci convert = string(the_arg.begin(), it1);
++ libdar::deci convert = string(the_arg.begin(), it1);
+ num = convert.computer();
+ }
+ // else we ignore the leading ','
+@@ -539,20 +539,20 @@ void line_tools_get_min_digits(string th
+ it2 = tools_find_first_char_of(tmp2, ',');
+ if(it2 == tmp2.end()) // just two number have been provided
+ {
+- deci convert = tmp2;
++ libdar::deci convert = tmp2;
+ ref_num = convert.computer();
+ }
+ else
+ {
+ if(tmp2.begin() != it2)
+ {
+- deci convert = string(tmp2.begin(), it2);
++ libdar::deci convert = string(tmp2.begin(), it2);
+ ref_num = convert.computer();
+ }
+ ++it2;
+ if(it2 != tmp2.end())
+ {
+- deci convert = string(it2, tmp2.end());
++ libdar::deci convert = string(it2, tmp2.end());
+ aux_num = convert.computer();
+ }
+ }
+--- src/libdar/generic_file.cpp 2013-08-25 19:09:49.000000000 +0200
++++ src/libdar/generic_file.cpp 2013-11-03 09:15:46.000000000 +0100
+@@ -470,7 +470,7 @@ namespace libdar
+
+ const char * generic_file_get_name(gf_mode mode)
+ {
+- char *ret = NULL;
++ const char *ret = NULL;
+
+ switch(mode)
+ {
+--- src/libdar/mask_list.hpp 2013-08-25 19:09:49.000000000 +0200
++++ src/libdar/mask_list.hpp 2013-11-16 16:56:09.000000000 +0100
+@@ -77,8 +77,8 @@ namespace libdar
+ class my_char
+ {
+ public:
+- my_char() { val = 0; };
++ my_char() = default;
+ my_char(const char x) : val(x) {};
+ bool operator < (const my_char & x) const
+ {
+ if(val == '/')
+--- src/libdar/tools.cpp 2013-08-26 00:02:14.000000000 +0200
++++ src/libdar/tools.cpp 2013-11-03 18:57:49.000000000 +0100
+@@ -1048,7 +1048,7 @@ namespace libdar
+
+ void tools_display_features(user_interaction & dialog)
+ {
+- char *endy = NULL;
++ const char *endy = NULL;
+
+ tools_display_features(dialog,
+ compile_time::ea(),
</ins></span></pre></div>
<a id="trunkdportsarchiversdarfilespatchdocMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff (115109 => 115110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff 2013-12-25 07:34:16 UTC (rev 115109)
+++ trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff 2013-12-25 07:56:10 UTC (rev 115110)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><del>-Fix http://sourceforge.net/tracker/?func=detail&aid=2854796&group_id=65612&atid=511612
---- doc/Makefile.in.orig 2009-05-22 04:55:08.000000000 -0500
-+++ doc/Makefile.in 2010-03-26 13:25:43.000000000 -0500
-@@ -553,7 +553,7 @@
</del><ins>+http://sourceforge.net/p/dar/patches/33/
+--- doc/Makefile.in.orig 2013-12-23 12:29:05.000000000 +0100
++++ doc/Makefile.in 2013-12-23 12:33:30.000000000 +0100
+@@ -646,7 +646,7 @@
+ @USE_DOXYGEN_TRUE@ rm -rf html Doxyfile.tmp
</ins><span class="cx">
</span><span class="cx"> @USE_DOXYGEN_TRUE@install-data-hook:
</span><del>- @USE_DOXYGEN_TRUE@ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/html
--@USE_DOXYGEN_TRUE@ $(INSTALL) -m 0644 html/* $(DESTDIR)$(pkgdatadir)/html
-+@USE_DOXYGEN_TRUE@ cp -a html/* $(DESTDIR)$(pkgdatadir)/html
</del><ins>+-@USE_DOXYGEN_TRUE@ cp -dR --preserve=mode html $(DESTDIR)$(pkgdatadir)
++@USE_DOXYGEN_TRUE@ cp -pR html $(DESTDIR)$(pkgdatadir)
</ins><span class="cx"> @USE_DOXYGEN_TRUE@ $(INSTALL_HTML_MAN)
</span><span class="cx">
</span><span class="cx"> @USE_DOXYGEN_TRUE@uninstall-hook:
</span></span></pre>
</div>
</div>
</body>
</html>