<!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>[149681] trunk/dports/graphics/babl</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/149681">149681</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-06-29 06:04:59 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>babl: allow 32-bit and universal builds
no revbump since port builds successfully or not at all</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsbablPortfile">trunk/dports/graphics/babl/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/babl/files/</li>
<li><a href="#trunkdportsgraphicsbablfilespatchconfigguessdiff">trunk/dports/graphics/babl/files/patch-config.guess.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsbablPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/babl/Portfile (149680 => 149681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/babl/Portfile 2016-06-29 11:15:54 UTC (rev 149680)
+++ trunk/dports/graphics/babl/Portfile 2016-06-29 13:04:59 UTC (rev 149681)
</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 babl
</span><span class="cx"> conflicts babl-devel
</span><span class="lines">@@ -30,6 +31,19 @@
</span><span class="cx"> configure.args --disable-silent-rules \
</span><span class="cx"> ac_cv_prog_AWK=/usr/bin/awk
</span><span class="cx">
</span><ins>+# have config.guess determine processor type (i386 or x86_64) for all macOS versions,
+# so we can specify a 32-bit build
+patchfiles-append patch-config.guess.diff
+
+# CC_FOR_BUILD is used by config.guess to determine processor type
+if {![variant_isset universal]} {
+ configure.env-append CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
+} else {
+ foreach arch ${configure.universal_archs} {
+ lappend merger_configure_env(${arch}) CC_FOR_BUILD='${configure.cc} -arch ${arch}'
+ }
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://download.gimp.org/pub/${name}/${branch}/
</span><span class="cx"> livecheck.regex "${name}-(\\d+(?:\\.\\d+)+)"
</span></span></pre></div>
<a id="trunkdportsgraphicsbablfilespatchconfigguessdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/babl/files/patch-config.guess.diff (0 => 149681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/babl/files/patch-config.guess.diff (rev 0)
+++ trunk/dports/graphics/babl/files/patch-config.guess.diff 2016-06-29 13:04:59 UTC (rev 149681)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+--- config.guess.orig 2016-06-12 15:32:38.000000000 -0700
++++ config.guess 2016-06-29 05:21:01.000000000 -0700
+@@ -1261,7 +1261,7 @@
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++ #if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+@@ -1273,15 +1273,15 @@
+ esac
+ fi
+ fi
+- elif test "$UNAME_PROCESSOR" = i386 ; then
++ #elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+- UNAME_PROCESSOR=x86_64
+- fi
++ #UNAME_PROCESSOR=x86_64
++ #fi
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
</ins></span></pre>
</div>
</div>
</body>
</html>