<!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>[128926] trunk/dports/x11</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/128926">128926</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-29 21:49:57 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pango, pango-devel: allow x11 and quartz variants to be enabled at the same time and enable Quartz support by default on OS X (#44414)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11pangoPortfile">trunk/dports/x11/pango/Portfile</a></li>
<li><a href="#trunkdportsx11pangodevelPortfile">trunk/dports/x11/pango-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11pangoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/pango/Portfile (128925 => 128926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/pango/Portfile 2014-11-30 05:48:19 UTC (rev 128925)
+++ trunk/dports/x11/pango/Portfile 2014-11-30 05:49:57 UTC (rev 128926)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> set my_name pango
</span><span class="cx"> epoch 1
</span><span class="cx"> version 1.36.8
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -47,20 +48,6 @@
</span><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx">
</span><del>-platform macosx {
-variant quartz {
- # Although this variant does nothing, pango will automatically build
- # itself differently depending on whether or not cairo is installed with
- # the quartz variant. Therefore this variant is necessary to be able to
- # distinguish whether an installed pango has quartz support or not.
-}
- if {[variant_isset quartz]} {
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
- } else {
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
- }
-}
-
</del><span class="cx"> pre-configure {
</span><span class="cx"> set fontconfig_minimum_version 2.10.91
</span><span class="cx"> set fontconfig_installed_version [exec ${prefix}/bin/pkg-config fontconfig --modversion]
</span><span class="lines">@@ -104,6 +91,24 @@
</span><span class="cx"> configure.args-append --with-included-modules
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+platform macosx {
+ variant quartz {
+ # Although this variant does nothing, pango will automatically build
+ # itself differently depending on whether or not cairo is installed with
+ # the quartz variant. Therefore this variant is necessary to be able to
+ # distinguish whether an installed pango has Quartz support or not.
+ }
+
+ default_variants +quartz
+ # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+ # case any dependents are using the active_variants portgroup to check for it.
+ variant_set quartz
+
+ if {[variant_isset quartz]} {
+ require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
+ }
+}
+
</ins><span class="cx"> variant x11 {
</span><span class="cx"> depends_lib-append port:Xft2
</span><span class="cx"> configure.args-delete --without-x
</span><span class="lines">@@ -112,11 +117,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +x11
</span><ins>+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+ # When not on OS X, don't allow X11 support to be disabled, since it is the
+ # only available option.
+ variant_set x11
+}
</ins><span class="cx">
</span><span class="cx"> if {[variant_isset x11]} {
</span><span class="cx"> require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
</span><del>-} else {
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre></div>
<a id="trunkdportsx11pangodevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/pango-devel/Portfile (128925 => 128926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/pango-devel/Portfile 2014-11-30 05:48:19 UTC (rev 128925)
+++ trunk/dports/x11/pango-devel/Portfile 2014-11-30 05:49:57 UTC (rev 128926)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> conflicts pango
</span><span class="cx"> set my_name pango
</span><span class="cx"> version 1.36.8
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -46,20 +47,6 @@
</span><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx">
</span><del>-platform macosx {
-variant quartz {
- # Although this variant does nothing, pango will automatically build
- # itself differently depending on whether or not cairo is installed with
- # the quartz variant. Therefore this variant is necessary to be able to
- # distinguish whether an installed pango has quartz support or not.
-}
- if {[variant_isset quartz]} {
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
- } else {
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
- }
-}
-
</del><span class="cx"> pre-configure {
</span><span class="cx"> set fontconfig_minimum_version 2.10.91
</span><span class="cx"> set fontconfig_installed_version [exec ${prefix}/bin/pkg-config fontconfig --modversion]
</span><span class="lines">@@ -103,6 +90,24 @@
</span><span class="cx"> configure.args-append --with-included-modules
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+platform macosx {
+ variant quartz {
+ # Although this variant does nothing, pango will automatically build
+ # itself differently depending on whether or not cairo is installed with
+ # the quartz variant. Therefore this variant is necessary to be able to
+ # distinguish whether an installed pango has Quartz support or not.
+ }
+
+ default_variants +quartz
+ # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+ # case any dependents are using the active_variants portgroup to check for it.
+ variant_set quartz
+
+ if {[variant_isset quartz]} {
+ require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
+ }
+}
+
</ins><span class="cx"> variant x11 {
</span><span class="cx"> depends_lib-append port:Xft2
</span><span class="cx"> configure.args-delete --without-x
</span><span class="lines">@@ -111,11 +116,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +x11
</span><ins>+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+ # When not on OS X, don't allow X11 support to be disabled, since it is the
+ # only available option.
+ variant_set x11
+}
</ins><span class="cx">
</span><span class="cx"> if {[variant_isset x11]} {
</span><span class="cx"> require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
</span><del>-} else {
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre>
</div>
</div>
</body>
</html>