<!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>[148220] trunk/dports/lang/dmd-tools</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/148220">148220</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-04-30 08:43:58 -0700 (Sat, 30 Apr 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>dmd-tools: allow universal build</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangdmdtoolsPortfile">trunk/dports/lang/dmd-tools/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/lang/dmd-tools/files/</li>
<li><a href="#trunkdportslangdmdtoolsfilespatchposixdiff">trunk/dports/lang/dmd-tools/files/patch-posix.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangdmdtoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dmd-tools/Portfile (148219 => 148220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dmd-tools/Portfile        2016-04-30 15:40:28 UTC (rev 148219)
+++ trunk/dports/lang/dmd-tools/Portfile        2016-04-30 15:43:58 UTC (rev 148220)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> PortGroup           github 1.0
</span><ins>+PortGroup           muniversal 1.0
</ins><span class="cx"> 
</span><span class="cx"> github.setup        D-Programming-Language tools 2.069.2 v
</span><span class="cx"> name                dmd-${github.project}
</span><span class="lines">@@ -27,23 +28,36 @@
</span><span class="cx"> 
</span><span class="cx"> use_configure       no
</span><span class="cx"> 
</span><del>-if {${build_arch} eq &quot;x86_64&quot;} {
-    set model 64
-} else {
-    set model 32
-}
</del><ins>+patchfiles          patch-posix.diff
</ins><span class="cx"> 
</span><span class="cx"> build.args          -f posix.mak \
</span><span class="cx">                     DRUNTIME=${prefix}/lib/libdruntime.a \
</span><span class="cx">                     DRUNTIME_PATH=${prefix}/include/druntime \
</span><del>-                    DMD=${prefix}/bin/dmd \
-                    DFLAGS=&quot;-w -d -m${model} -O -release&quot; \
-                    MODEL=${model}
</del><ins>+                    DMD=${prefix}/bin/dmd
</ins><span class="cx"> build.target        &quot;&quot;
</span><span class="cx"> 
</span><del>-destroot.args       -f posix.mak \
-                    INSTALL_DIR=${destroot}${prefix} \
-                    MODEL=${model}
</del><ins>+destroot.args       -f posix.mak PREFIX=${prefix}
+
+if { ![variant_isset universal] } {
+    if { ${build_arch} eq &quot;x86_64&quot; || ${build_arch} eq &quot;ppc64&quot; } {
+        build.args-append    MODEL=64
+        destroot.args-append MODEL=64
+    } else {
+        build.args-append    MODEL=32
+        destroot.args-append MODEL=32
+    }
+} else {
+    lappend merger_build_args(x86_64)    MODEL=64
+    lappend merger_build_args(i386)      MODEL=32
+    lappend merger_build_args(ppc64)     MODEL=64
+    lappend merger_build_args(ppc)       MODEL=32
+
+    lappend merger_destroot_args(x86_64) MODEL=64
+    lappend merger_destroot_args(i386)   MODEL=32
+    lappend merger_destroot_args(ppc64)  MODEL=64
+    lappend merger_destroot_args(ppc)    MODEL=32
+}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx">     xinstall -W ${worksrcpath} -m 644 man/man1/rdmd.1 ${destroot}${prefix}/share/man/man1
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportslangdmdtoolsfilespatchposixdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/dmd-tools/files/patch-posix.diff (0 => 148220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dmd-tools/files/patch-posix.diff                                (rev 0)
+++ trunk/dports/lang/dmd-tools/files/patch-posix.diff        2016-04-30 15:43:58 UTC (rev 148220)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- posix.mak.orig        2015-10-04 11:19:24.000000000 -0700
++++ posix.mak        2016-04-30 07:44:08.000000000 -0700
+@@ -1,6 +1,6 @@
+ DMD = ../dmd/src/dmd
+ CC = gcc
+-INSTALL_DIR = ../install
++INSTALL_DIR = $(DESTDIR)$(PREFIX)
+ DRUNTIME_PATH = ../druntime
+ PHOBOS_PATH = ../phobos
+
+@@ -67,7 +67,7 @@
+ # default include/link paths, override by setting DMD (e.g. make -f posix.mak DMD=dmd)
+ DMD += -I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) -L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL)
+
+-DFLAGS = -w
++DFLAGS = -w -O -release
+
+ TOOLS = \
+     $(ROOT)/rdmd \
</ins></span></pre>
</div>
</div>

</body>
</html>