<!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>[142533] trunk/dports/devel/libical</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/142533">142533</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2015-11-14 08:25:14 -0800 (Sat, 14 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libical(-devel): fixing Portfile to also build devel subport</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibicalPortfile">trunk/dports/devel/libical/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibicalfilespatchfix_timezone_crashdiff">trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff</a></li>
<li><a href="#trunkdportsdevellibicalfilespatchmake_recursive_mutexdiff">trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibicalfilesfix_timezone_crashpatch">trunk/dports/devel/libical/files/fix_timezone_crash.patch</a></li>
<li><a href="#trunkdportsdevellibicalfilesmake_recursive_mutexpatch">trunk/dports/devel/libical/files/make_recursive_mutex.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibicalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libical/Portfile (142532 => 142533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libical/Portfile 2015-11-14 14:55:41 UTC (rev 142532)
+++ trunk/dports/devel/libical/Portfile 2015-11-14 16:25:14 UTC (rev 142533)
</span><span class="lines">@@ -3,17 +3,31 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+PortGroup github 1.0
+
</ins><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="cx"> name libical
</span><ins>+
+if {${subport} eq "${name}"} {
+ # version 1.0.1 currently doesn't compile on OSX, thus still use 1.0.0
+ github.setup libical libical 1.0.0 v
+ revision 1
+ conflicts libical-devel
+} else {
+ # libical-devel:
+ github.setup libical libical 25bc500e15bafcef7324ec9b6472982b56dcdc6d
+ version 1.0.1.351
+ conflicts libical
+}
+
</ins><span class="cx"> categories devel
</span><span class="cx"> license {LGPL-2.1 MPL-1}
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> description An implementation of iCalendar protocols and data formats
</span><span class="cx"> long_description ${description}
</span><span class="cx"> platforms darwin
</span><del>-homepage http://sourceforge.net/projects/freeassociation/
-master_sites sourceforge:freeassociation
</del><ins>+homepage https://github.com/libical
</ins><span class="cx">
</span><span class="cx"> subport libical-devel {
</span><span class="cx"> description-append \
</span><span class="lines">@@ -23,27 +37,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "${name}"} {
</span><del>- version 1.0
- revision 1
- checksums rmd160 1c78b07c37c80e8fe068fb3164bbf8614f02e67f \
- sha256 7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7
</del><ins>+ # v 1.0.0
+ checksums rmd160 67142db7d1af937082d29326a4dda108da07afb3 \
+ sha256 b11bb6d9f97f9bc6b0798197a41c5ea9a0e939736e4afdb08b43a105377a1dac
+
+ # v 1.0.1
+ #checksums rmd160 780f9fb08b324536af362f8812ff671e4d1082d0 \
+ # sha256 b3898c9ca3522ba4f0454e8b7c26a85b2b1259e16d670cccf7abb035c8a6caa9
+
</ins><span class="cx"> patchfiles-append \
</span><del>- fix_timezone_crash.patch \
- make_recursive_mutex.patch
</del><ins>+ patch-fix_timezone_crash.diff \
+ patch-make_recursive_mutex.diff
</ins><span class="cx"> } else {
</span><span class="cx"> # v1.0.1-351-g25bc500
</span><ins>+ checksums rmd160 4379c5d6d31a78ecb2ceaff6e64a8900e9b30cfe \
+ sha256 f7c22344a461f8ee1ce65e3efa477e9846b1ca39f44af622a149ce37f3850332
+
</ins><span class="cx"> maintainers gmail.com:rjvbertin openmaintainer
</span><del>- if {[file exists ${filespath}/libical-git/.git]} {
- fetch.type git
- git.url ${filespath}/libical-git
- git.branch 25bc500e15bafcef7324ec9b6472982b56dcdc6d
- } else {
- PortGroup github 1.0
- git.url http://github.com/libical/libical
- github.setup \
- libical libical 25bc500e15bafcef7324ec9b6472982b56dcdc6d
- }
- version 1.0.1.351
</del><span class="cx"> distname ${name}-git
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,5 +62,5 @@
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><del>-livecheck.url http://sourceforge.net/projects/freeassociation/files/
</del><ins>+livecheck.url https://github.com/libical/libical/releases
</ins><span class="cx"> livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span></span></pre></div>
<a id="trunkdportsdevellibicalfilesfix_timezone_crashpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libical/files/fix_timezone_crash.patch (142532 => 142533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libical/files/fix_timezone_crash.patch 2015-11-14 14:55:41 UTC (rev 142532)
+++ trunk/dports/devel/libical/files/fix_timezone_crash.patch 2015-11-14 16:25:14 UTC (rev 142533)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-Description: work around heap corruption bug
-Author: Robie Basak <robie.basak@canonical.com>
-Last-Update: 2012-04-04
-Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29084189
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/956843
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3514871&group_id=16077&atid=116077
-
----
- src/libical/icaltimezone.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libical-1.0/src/libical/icaltimezone.c
-===================================================================
---- libical-1.0.orig/src/libical/icaltimezone.c 2013-06-11 15:34:23.913446943 +0100
-+++ libical-1.0/src/libical/icaltimezone.c 2013-06-11 15:34:23.905446943 +0100
-@@ -1686,7 +1686,7 @@
- icalerror_assert (builtin_timezones == NULL,
- "Parsing zones.tab file multiple times");
-
-- builtin_timezones = icalarray_new (sizeof (icaltimezone), 32);
-+ builtin_timezones = icalarray_new (sizeof (icaltimezone), 1024);
-
- #ifndef USE_BUILTIN_TZDATA
- filename_len = strlen ((char *) icaltzutil_get_zone_directory()) + strlen (ZONES_TAB_SYSTEM_FILENAME)
</del></span></pre></div>
<a id="trunkdportsdevellibicalfilesmake_recursive_mutexpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libical/files/make_recursive_mutex.patch (142532 => 142533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libical/files/make_recursive_mutex.patch 2015-11-14 14:55:41 UTC (rev 142532)
+++ trunk/dports/devel/libical/files/make_recursive_mutex.patch 2015-11-14 16:25:14 UTC (rev 142533)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- libical-1.0/src/libical/orig.icaltimezone.c 2014-07-28 17:05:08.000000000 +0200
-+++ libical-1.0/src/libical/icaltimezone.c 2014-07-28 17:07:13.000000000 +0200
-@@ -47,7 +47,10 @@
-
- #ifdef HAVE_PTHREAD
- #include <pthread.h>
--static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
-+// static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
-+// It seems the same thread can attempt to lock builtin_mutex multiple times
-+// (at least when using builtin tzdata), so make it builtin_mutex recursive:
-+static pthread_mutex_t builtin_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
- #endif
-
- #ifdef WIN32
-
</del></span></pre></div>
<a id="trunkdportsdevellibicalfilespatchfix_timezone_crashdifffromrev142532trunkdportsdevellibicalfilesfix_timezone_crashpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff (from rev 142532, trunk/dports/devel/libical/files/fix_timezone_crash.patch) (0 => 142533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff (rev 0)
+++ trunk/dports/devel/libical/files/patch-fix_timezone_crash.diff 2015-11-14 16:25:14 UTC (rev 142533)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Description: work around heap corruption bug
+Author: Robie Basak <robie.basak@canonical.com>
+Last-Update: 2012-04-04
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29084189
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/956843
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3514871&group_id=16077&atid=116077
+
+---
+ src/libical/icaltimezone.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libical-1.0/src/libical/icaltimezone.c
+===================================================================
+--- libical-1.0.orig/src/libical/icaltimezone.c 2013-06-11 15:34:23.913446943 +0100
++++ libical-1.0/src/libical/icaltimezone.c 2013-06-11 15:34:23.905446943 +0100
+@@ -1686,7 +1686,7 @@
+ icalerror_assert (builtin_timezones == NULL,
+ "Parsing zones.tab file multiple times");
+
+- builtin_timezones = icalarray_new (sizeof (icaltimezone), 32);
++ builtin_timezones = icalarray_new (sizeof (icaltimezone), 1024);
+
+ #ifndef USE_BUILTIN_TZDATA
+ filename_len = strlen ((char *) icaltzutil_get_zone_directory()) + strlen (ZONES_TAB_SYSTEM_FILENAME)
</ins></span></pre></div>
<a id="trunkdportsdevellibicalfilespatchmake_recursive_mutexdifffromrev142532trunkdportsdevellibicalfilesmake_recursive_mutexpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff (from rev 142532, trunk/dports/devel/libical/files/make_recursive_mutex.patch) (0 => 142533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff (rev 0)
+++ trunk/dports/devel/libical/files/patch-make_recursive_mutex.diff 2015-11-14 16:25:14 UTC (rev 142533)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- libical-1.0/src/libical/orig.icaltimezone.c 2014-07-28 17:05:08.000000000 +0200
++++ libical-1.0/src/libical/icaltimezone.c 2014-07-28 17:07:13.000000000 +0200
+@@ -47,7 +47,10 @@
+
+ #ifdef HAVE_PTHREAD
+ #include <pthread.h>
+-static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
++// static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
++// It seems the same thread can attempt to lock builtin_mutex multiple times
++// (at least when using builtin tzdata), so make it builtin_mutex recursive:
++static pthread_mutex_t builtin_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+ #endif
+
+ #ifdef WIN32
+
</ins></span></pre>
</div>
</div>
</body>
</html>