<!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>[142121] trunk/dports/devel/gtk2hs/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/142121">142121</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-11-04 00:08:38 -0800 (Wed, 04 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtk2hs: replace no_x11 by x11 (#39383), but the port is broken anyway (#43583), so no need to bother about transition</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgtk2hsPortfile">trunk/dports/devel/gtk2hs/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgtk2hsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gtk2hs/Portfile (142120 => 142121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gtk2hs/Portfile 2015-11-04 07:55:17 UTC (rev 142120)
+++ trunk/dports/devel/gtk2hs/Portfile 2015-11-04 08:08:38 UTC (rev 142121)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> path:lib/pkgconfig/cairo.pc:cairo \
</span><span class="cx"> port:librsvg \
</span><span class="cx"> port:libglade2 \
</span><del>- port:gtkglext \
</del><span class="cx"> port:gtksourceview2
</span><span class="cx">
</span><span class="cx"> configure.args --with-hc=${prefix}/bin/ghc \
</span><span class="lines">@@ -42,24 +41,15 @@
</span><span class="cx"> --enable-gtksourceview2 \
</span><span class="cx"> --enable-cairo \
</span><span class="cx"> --enable-svg \
</span><del>- --enable-opengl \
</del><span class="cx"> --without-pkgreg
</span><span class="cx">
</span><del>-# https://trac.macports.org/ticket/39383
-variant no_x11 {
- depends_lib-delete port:gtkglext
- configure.args-delete --enable-opengl
</del><ins>+variant x11 {
+ depends_lib-append port:gtkglext
+ configure.args-append --enable-opengl
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-# Use the same rules as GTK Portfile for setting the default variants
-if {[variant_isset no_x11]} {
- default_variants +quartz
-}
</del><ins>+default_variants +x11
</ins><span class="cx">
</span><del>-if {![variant_isset quartz]} {
- default_variants +x11
-}
-
</del><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><span class="cx"> # Fix gtk.package.conf to allow interoperating with non-MacPorts
</span><span class="lines">@@ -68,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> set pkgs {glib gio cairo svgcairo gtk gconf glade gtkglext gtksourceview2 soegtk}
</span><del>- if {[variant_isset no_x11]} {
</del><ins>+ if {![variant_isset x11]} {
</ins><span class="cx"> set pkgs {glib gio cairo svgcairo gtk gconf glade gtksourceview2 soegtk}
</span><span class="cx"> }
</span><span class="cx"> foreach pkg ${pkgs} {
</span><span class="lines">@@ -82,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> set pkgs {glib gio cairo svgcairo gtk gconf glade gtkglext gtksourceview2 soegtk}
</span><del>- if {[variant_isset no_x11]} {
</del><ins>+ if {![variant_isset x11]} {
</ins><span class="cx"> set pkgs {glib gio cairo svgcairo gtk gconf glade gtksourceview2 soegtk}
</span><span class="cx"> }
</span><span class="cx"> foreach pkg ${pkgs} {
</span></span></pre>
</div>
</div>
</body>
</html>