<!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>[121811] trunk/dports/net/mcabber</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/121811">121811</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-08 11:00:32 -0700 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mcabber: update to version 0.10.3 to fix build with libotr 4.0.0 (#40756, maintainer timeout).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetmcabberPortfile">trunk/dports/net/mcabber/Portfile</a></li>
<li><a href="#trunkdportsnetmcabberfilespatchautogenshdiff">trunk/dports/net/mcabber/files/patch-autogen.sh.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetmcabberfilespatchautomake113diff">trunk/dports/net/mcabber/files/patch-automake-1.13.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetmcabberPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/mcabber/Portfile (121810 => 121811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/mcabber/Portfile 2014-07-08 17:59:06 UTC (rev 121810)
+++ trunk/dports/net/mcabber/Portfile 2014-07-08 18:00:32 UTC (rev 121811)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name mcabber
</span><del>-version 0.9.10
-revision 1
</del><ins>+version 0.10.3
+license GPL-2+
</ins><span class="cx"> categories net
</span><span class="cx"> maintainers hitzemann.org:simon
</span><span class="cx"> description Console Jabber client
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> master_sites http://mcabber.com/files/
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums rmd160 656818b304b9088097ad2a0fe485f38cd0e704fc \
- sha256 431e47ba3095c1cc6c11931bab9034c42ba0911dfadcc137ba765803e4460cb5
</del><ins>+checksums rmd160 d94e7b2e340cfd83a5b55276cdb0383a8555b347 \
+ sha256 77466138496cc26db125145cc28dc4fc0df79827143b922dfb9f02eb0dc7fa6d
</ins><span class="cx">
</span><span class="cx"> depends_lib port:libiconv \
</span><span class="cx"> port:ncurses \
</span><span class="lines">@@ -25,25 +25,26 @@
</span><span class="cx"> port:gettext \
</span><span class="cx"> port:libotr \
</span><span class="cx"> port:gpgme \
</span><del>- port:libgcrypt
</del><ins>+ port:libgcrypt \
+ port:loudmouth
</ins><span class="cx">
</span><span class="cx"> depends_build port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:coreutils \
</span><span class="cx"> bin:gawk:gawk \
</span><span class="cx"> port:libtool \
</span><del>- port:pkgconfig
</del><ins>+ port:pkgconfig \
+ port:cctools \
+ port:grep \
+ port:gsed
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-otr \
</span><span class="cx"> --with-libotr-prefix=${prefix}/lib \
</span><del>- --with-libotr-inc-prefix=${prefix}/include \
- --without-ssl \
- --without-openssl
</del><ins>+ --with-libotr-inc-prefix=${prefix}/include
</ins><span class="cx">
</span><span class="cx"> configure.env LIBTOOL=glibtool
</span><span class="cx">
</span><del>-patchfiles patch-autogen.sh.diff \
- patch-automake-1.13.diff
</del><ins>+patchfiles patch-autogen.sh.diff
</ins><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="cx"> system -W ${worksrcpath} "./autogen.sh"
</span><span class="lines">@@ -51,28 +52,13 @@
</span><span class="cx">
</span><span class="cx"> # TODO
</span><span class="cx"> # Bug #26 on mcabber - see pre-configure section for a workaround
</span><del>-variant gnutls description {Use GNUTLS for TLS connections} {
- configure.args-delete --without-ssl
- configure.args-append --with-ssl
- configure.args-append --with-libgnutls-extra-prefix=${prefix}
- depends_lib-append port:gnutls
-}
-
-variant ssl description {Use OpenSSL for SSL connections} {
- configure.args-delete --without-ssl
- configure.args-delete --without-openssl
- configure.args-append --with-ssl
- configure.args-append --with-openssl=${prefix}
- depends_lib-append port:openssl
-}
-
</del><span class="cx"> variant aspell description {Use aspell spell checking - remember to install a dictionary, too} {
</span><span class="cx"> configure.args-append --enable-aspell
</span><span class="cx"> depends_lib-append port:aspell
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-configure {
</span><del>- reinplace "s|#define HAVE_LOCALCHARSET_H 1|\/\* #undef HAVE_LOCALCHARSET_H \*\/|g" ${worksrcpath}/config.h
</del><ins>+ reinplace "s|#define HAVE_LOCALCHARSET_H 1|\/\* #undef HAVE_LOCALCHARSET_H \*\/|g" ${worksrcpath}/${name}/config.h
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsnetmcabberfilespatchautogenshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/mcabber/files/patch-autogen.sh.diff (121810 => 121811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/mcabber/files/patch-autogen.sh.diff 2014-07-08 17:59:06 UTC (rev 121810)
+++ trunk/dports/net/mcabber/files/patch-autogen.sh.diff 2014-07-08 18:00:32 UTC (rev 121811)
</span><span class="lines">@@ -1,12 +1,11 @@
</span><del>---- autogen.sh.orig 2009-02-05 10:54:06.000000000 +0100
-+++ autogen.sh 2009-02-05 10:54:17.000000000 +0100
-@@ -1,7 +1,7 @@
</del><ins>+--- autogen.sh.orig
++++ autogen.sh
+@@ -1,6 +1,6 @@
</ins><span class="cx"> #! /bin/sh
</span><span class="cx">
</span><span class="cx"> -libtoolize --force --automake --copy
</span><del>--aclocal -I macros/
</del><span class="cx"> +glibtoolize --force --automake --copy
</span><del>-+aclocal -I macros/ -I macros/missing/
</del><ins>+ aclocal -I macros/
</ins><span class="cx"> autoheader
</span><span class="cx"> autoconf
</span><span class="cx"> automake -a --copy
</span></span></pre></div>
<a id="trunkdportsnetmcabberfilespatchautomake113diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/mcabber/files/patch-automake-1.13.diff (121810 => 121811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/mcabber/files/patch-automake-1.13.diff 2014-07-08 17:59:06 UTC (rev 121810)
+++ trunk/dports/net/mcabber/files/patch-automake-1.13.diff 2014-07-08 18:00:32 UTC (rev 121811)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- configure.ac.orig 2009-10-06 14:34:18.000000000 -0500
-+++ configure.ac 2013-03-22 03:05:28.000000000 -0500
-@@ -5,7 +5,7 @@
- AC_INIT([mcabber],[0.9.10],[mcabber@lilotux.net])
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([src])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
-
- #AC_PROG_LIBTOOL
- AC_PROG_RANLIB
</del></span></pre>
</div>
</div>
</body>
</html>