<!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>[125904] trunk/dports/security/botan/Portfile</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/125904">125904</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-09-28 22:46:16 -0700 (Sun, 28 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>botan: add python2.7 dependency and universal variant, closes #39635
Without the python2.7 dependency the port might fail to build if somebody
selected python3 as his "python". I know that's discouraged, but people do it
anyway.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecuritybotanPortfile">trunk/dports/security/botan/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecuritybotanPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/botan/Portfile (125903 => 125904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/botan/Portfile 2014-09-29 04:57:16 UTC (rev 125903)
+++ trunk/dports/security/botan/Portfile 2014-09-29 05:46:16 UTC (rev 125904)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
+PortGroup muniversal 1.0
</ins><span class="cx">
</span><span class="cx"> name botan
</span><span class="cx"> version 1.10.8
</span><ins>+revision 1
</ins><span class="cx"> categories security devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers mww
</span><span class="lines">@@ -22,11 +24,12 @@
</span><span class="cx"> sha256 bc2fd5fe904bba7cd688df021689f53a2d2f87ae728b647196a6b5954d184ea0
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><ins>+depends_build port:python27
</ins><span class="cx"> depends_lib port:openssl port:zlib port:bzip2
</span><span class="cx">
</span><span class="cx"> worksrcdir Botan-${version}
</span><span class="cx">
</span><del>-configure.cmd ./configure.py
</del><ins>+configure.cmd ${prefix}/bin/python2.7 ./configure.py
</ins><span class="cx"> configure.args --docdir=share/doc --with-openssl --with-zlib --with-bzip2
</span><span class="cx">
</span><span class="cx"> if {[string match *clang* ${configure.compiler}]} {
</span><span class="lines">@@ -39,25 +42,39 @@
</span><span class="cx">
</span><span class="cx"> platform darwin { configure.args-append --os=darwin }
</span><span class="cx">
</span><del>-if {[info exists build_arch] && ${os.platform} eq "darwin"} {
- if {(${build_arch} eq "i386")} {
- configure.args-append --cpu=ia32
- build.args CXX="${configure.cxx} -m32"
- } elseif {(${build_arch} eq "x86_64")} {
- configure.args-append --cpu=amd64
- build.args CXX="${configure.cxx} -m64"
- } elseif {(${build_arch} eq "ppc")} {
- configure.args-append --cpu=ppc
- build.args CXX="${configure.cxx} -m32"
- } elseif {(${build_arch} eq "ppc64")} {
- configure.args-append --cpu=ppc64
- build.args CXX="${configure.cxx} -m64"
</del><ins>+# botan way of setting cpu type in build phase
+array set merger_configure_args {
+ ppc --cpu=ppc
+ i386 --cpu=ia32
+ ppc64 --cpu=ppc64
+ x86_64 --cpu=amd64
+}
+
+if {![variant_isset universal]} {
+ if {[info exists build_arch] && ${os.platform} eq "darwin"} {
+ switch ${build_arch} {
+ ppc -
+ i386 {
+ build.args CXX="${configure.cxx} -m32"
+ }
+ ppc64 -
+ x86_64 {
+ build.args CXX="${configure.cxx} -m64"
+ }
+ }
+ configure.args-append $merger_configure_args(${build_arch})
+ } else {
+ build.args CXX="${configure.cxx}"
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- build.args CXX="${configure.cxx}"
</del><ins>+ # the arch flag is lost in the build phase, so put it back
+ foreach arch ${configure.universal_archs} {
+ lappend merger_build_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-universal_variant no
</del><ins>+# configure.py rejects this argument
+configure.universal_args-delete --disable-dependency-tracking
</ins><span class="cx">
</span><span class="cx"> livecheck.regex "Botan-(1.10.\[0-9\]+).tbz"
</span><span class="cx"> livecheck.url http://botan.randombit.net/download.html
</span></span></pre>
</div>
</div>
</body>
</html>