<!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>[50234] trunk/dports/x11/gtk2/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="http://trac.macports.org/changeset/50234">50234</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2009-04-27 17:09:45 -0700 (Mon, 27 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>gtk2: Build universal binaries with muniversal PortGroup.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11gtk2Portfile">trunk/dports/x11/gtk2/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11gtk2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/gtk2/Portfile (50233 => 50234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/gtk2/Portfile        2009-04-28 00:08:29 UTC (rev 50233)
+++ trunk/dports/x11/gtk2/Portfile        2009-04-28 00:09:45 UTC (rev 50234)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx"> 
</span><span class="cx"> PortSystem      1.0
</span><ins>+PortGroup       muniversal 1.0
</ins><span class="cx"> 
</span><span class="cx"> name            gtk2
</span><span class="cx"> version         2.16.1
</span><span class="lines">@@ -33,10 +34,6 @@
</span><span class="cx">     default_variants    +x11
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-if {[variant_isset universal]} {
-    configure.env-append    CUPS_CONFIG=&quot;${configure.universal_sysroot}/usr/bin/cups-config&quot;
-}
-
</del><span class="cx"> pre-fetch {
</span><span class="cx">     if {![variant_isset quartz] &amp;&amp; ![variant_isset x11]} {
</span><span class="cx">         error &quot;Either +x11 or +quartz is required&quot;
</span><span class="lines">@@ -95,6 +92,60 @@
</span><span class="cx"> configure.args  --enable-static \
</span><span class="cx">                 --disable-glibtest
</span><span class="cx"> 
</span><ins>+if { [variant_isset universal] } {
+    configure.env-append    CUPS_CONFIG=&quot;${configure.universal_sysroot}/usr/bin/cups-config&quot;
+
+    # cups is not 32/64-bit universal on Tiger. 
+    if { ${universal_sysroot}==&quot;/Developer/SDKs/MacOSX10.4u.sdk&quot; } {
+        set merger_configure_args(ppc64)   --disable-cups
+        set merger_configure_args(x86_64)  --disable-cups
+    }
+    
+    # Find architectures which will not run on build platform.
+    if { ${os.arch}==&quot;i386&quot; } {
+        if { ${os.major} &gt;= 10 } {
+            set cross_archs &quot;ppc ppc64&quot;
+        } else {
+            set cross_archs &quot;ppc64&quot;
+        }
+        set host_archs &quot;ppc ppc64&quot;
+    } else {
+        set cross_archs &quot;i386 x86_64&quot;
+        set host_archs &quot;i386 x86_64&quot;
+    }
+    
+    set run_arch [lindex ${universal_archs} 0]
+    if { [lsearch ${cross_archs} ${run_arch}] &gt;= 0 } {
+        ui_msg &quot;When building a universal binary of ${name}, make sure none of {${cross_archs}} is first in universal_archs in ${prefix}/etc/macports/macports.conf&quot;
+        error &quot;incompatible universal_archs value&quot;
+    }
+
+    foreach arch ${host_archs} {
+        lappend merger_configure_env(${arch}) \
+            NM='/usr/bin/nm -p'
+    }
+
+    foreach arch ${cross_archs} {
+        lappend merger_configure_env(${arch}) \
+            gio_can_sniff=yes \
+            GTK_UPDATE_ICON_CACHE=${worksrcpath}-${run_arch}/gtk/gtk-update-icon-cache \
+            GDK_PIXBUF_CSOURCE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf-csource
+    }
+
+    post-configure {
+        # Let gtk_host in .pc files be the same on all architectures
+        foreach arch ${host_archs} {
+            foreach pc [glob -directory ${worksrcpath}-${arch} *.pc.in] {
+                if { ${os.arch}==&quot;i386&quot; } {
+                    reinplace &quot;s|gtk_host=@host@|gtk_host=i686-apple-darwin${os.version}|&quot; ${pc}
+                } else {
+                    reinplace &quot;s|gtk_host=@host@|gtk_host=powerpc-apple-darwin${os.version}|&quot; ${pc}
+                }
+            }
+        }
+    }
+}
+    
</ins><span class="cx"> configure.ccache            no
</span><span class="cx"> configure.cppflags-append   -DX_LOCALE
</span><span class="cx"> configure.cflags-append     -fstrict-aliasing
</span></span></pre>
</div>
</div>

</body>
</html>