<!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>[121458] users/mojca/ports/cross/mingw-w64/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/121458">121458</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-25 17:41:01 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/mingw-w64: fix directory structure for version 3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcaportscrossmingww64Portfile">users/mojca/ports/cross/mingw-w64/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcaportscrossmingww64Portfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/cross/mingw-w64/Portfile (121457 => 121458)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/cross/mingw-w64/Portfile        2014-06-26 00:31:14 UTC (rev 121457)
+++ users/mojca/ports/cross/mingw-w64/Portfile        2014-06-26 00:41:01 UTC (rev 121458)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup GitHub 1.0
</del><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><span class="cx"> github.setup mirror mingw-w64 3.1.0 v
</span><span class="cx"> set mingw_name w64-mingw32
</span><span class="lines">@@ -35,26 +35,24 @@
</span><span class="cx"> subport i686-${mingw_name}-crt {
</span><span class="cx"> set mingw_arch i686
</span><span class="cx"> set mingw_dir crt
</span><del>- set mingw_bits 32
</del><span class="cx"> }
</span><span class="cx"> subport x86_64-${mingw_name}-crt {
</span><span class="cx"> set mingw_arch x86_64
</span><span class="cx"> set mingw_dir crt
</span><del>- set mingw_bits 64
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} ne ${name}} {
</span><span class="cx"> set mingw_target ${mingw_arch}-${mingw_name}
</span><span class="cx"> set mingw_prefix ${prefix}/${mingw_target}
</span><span class="cx"> configure.cmd ${worksrcpath}/mingw-w64-${mingw_dir}/configure
</span><del>- configure.args-append --prefix=${mingw_prefix} \
</del><ins>+ # TODO: remove one level in --prefix and --with-sysroot (but figure out how to do it consistently/properly)
+ configure.args-append --prefix=${mingw_prefix}/${mingw_target} \
</ins><span class="cx"> --host=${mingw_target}
</span><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span><span class="cx">
</span><span class="cx"> if {${mingw_dir} eq "headers"} {
</span><span class="cx"> post-destroot {
</span><del>- file mkdir "${destroot}/${mingw_prefix}/mingw"
- ln -s "../include" "${destroot}/${mingw_prefix}/mingw/include"
</del><ins>+ ln -s ${mingw_target} "${destroot}${mingw_prefix}/mingw"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,8 +62,7 @@
</span><span class="cx"> port:${mingw_target}-gcc \
</span><span class="cx"> port:${mingw_target}-headers
</span><span class="cx"> # maybe that's already default?
</span><del>- configure.args-append --enable-lib${mingw_bits} \
- --with-sysroot=${mingw_prefix}
</del><ins>+ configure.args-append --with-sysroot=${mingw_prefix}/${mingw_target}
</ins><span class="cx"> configure.cppflags "-I${mingw_prefix}/include"
</span><span class="cx">
</span><span class="cx"> # ----- from crossgcc (not sure if needed) ----
</span><span class="lines">@@ -84,9 +81,10 @@
</span><span class="cx"> # -----
</span><span class="cx">
</span><span class="cx"> # is there a more elegant way?
</span><del>- # configure.cc ${prefix}/bin/${mingw_target}-gcc
- # configure.cxx ${prefix}/bin/${mingw_target}-g++
- # configure.cpp ${prefix}/bin/${mingw_target}-cpp
</del><ins>+ configure.cc ${prefix}/bin/${mingw_target}-gcc
+ configure.cxx ${prefix}/bin/${mingw_target}-g++
+ configure.cpp ${prefix}/bin/${mingw_target}-cpp
+ # configure.env-append PATH=...
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot.violate_mtree yes
</span></span></pre>
</div>
</div>
</body>
</html>