<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 6/29/15 12:22 PM,
<a class="moz-txt-link-abbreviated" href="mailto:elelay@macports.org">elelay@macports.org</a> wrote:<br>
</div>
<blockquote cite="mid:20150629192204.D7EC0140EF5@svn.macports.org"
type="cite">
<meta http-equiv="content-type" content="text/html;
charset=windows-1252">
<title>[138119]
users/elelay/ports/devel/gtk-osx-application/Portfile</title>
<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 moz-do-not-send="true"
href="https://trac.macports.org/changeset/138119">138119</a></dd>
<dt>Author</dt>
<dd><a class="moz-txt-link-abbreviated" href="mailto:elelay@macports.org">elelay@macports.org</a></dd>
<dt>Date</dt>
<dd>2015-06-29 12:22:04 -0700 (Mon, 29 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>update messages and docs, remove unused variants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a moz-do-not-send="true"
href="#userselelayportsdevelgtkosxapplicationPortfile">users/elelay/ports/devel/gtk-osx-application/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<div class="modfile">
<h4>Modified:
users/elelay/ports/devel/gtk-osx-application/Portfile
(138118 => 138119)</h4>
<pre class="diff"><span>
<span class="info">--- users/elelay/ports/devel/gtk-osx-application/Portfile        2015-06-29 19:16:00 UTC (rev 138118)
+++ users/elelay/ports/devel/gtk-osx-application/Portfile        2015-06-29 19:22:04 UTC (rev 138119)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx">
</span><span class="cx"> long_description \
</span><span class="cx">                 A simple library whose purpose is to \
</span><del>-                allow GTK2 quartz applications to integrate with \
-                the Mac OS X menu bar. Requires gtk2 and its \
- dependencies to be built with variants +no_x11 +quartz
</del><ins>+                allow GTK quartz applications to integrate with \
+                the Mac OS X menu bar. Requires gtk2 or gtk3 and its \
+                dependencies to be built with variant +quartz
</ins><span class="cx">
</span><span class="cx"> homepage <a class="moz-txt-link-freetext" href="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration">https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration</a>
</span><span class="cx">
</span><span class="lines">@@ -36,37 +36,29 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-variant gtk2 description {Dummy gtk2 variant} {
-}
-
-variant gtk3 description {Dummy gtk3 variant} {
-}
-
</del><span class="cx"> set gtk_version gtk2
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="cx"> ui_error "
</span><del>-*** The gtk-osx-application port has been replaced by 'gtk-osx-application-gtk2'
-*** and 'gtk-osx-application-gtk3'. Please `sudo port deactivate gtk-osx-application`
-*** followed by the `sudo port upgrade -u outdated` or another command to update.
-*** Then if all works as intended `sudo port uninstall gtk-osx-application`
-***"
</del><ins>+The gtk-osx-application port has been replaced by 'gtk-osx-application-gtk2'
+and 'gtk-osx-application-gtk3'.
+Please `sudo port deactivate gtk-osx-application`
+followed by `sudo port upgrade -u outdated` or another command to update.
+Then if all works as intended `sudo port uninstall gtk-osx-application`
+"
</ins><span class="cx"> return -code error
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {![active_variants $gtk_version quartz x11]} {
</del><ins>+ if {![active_variants $gtk_version quartz ""]} {
</ins><span class="cx"> ui_error "
</span><del>-
-****
-**** gtk-osx-application is meant to be used only in a GTK quartz
-**** development environment but your version of GTK does not
-**** support quartz. Please make sure that port $gtk_version and all its
-**** dependencies are built with variants +no_x11 +quartz and try again.
-****
</del><ins>+${name} is meant to be used only in a GTK quartz
+development environment but your version of GTK does not
+support quartz. Please make sure that port $gtk_version and all its
+dependencies are built with variants +quartz and try again.
</ins><span class="cx"> "
</span><del>- error "$gtk_version +no_x11 +quartz not installed."
</del><ins>+ error "$gtk_version +quartz not installed."
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
</blockquote>
Eric --<br>
<br>
I've updated my copy to be in sync with yours and will be testing
the gimp ports and adding a +quartz variant to gedit this
afternoon. Will let you know how that goes.<br>
<br>
One small additional suggestion. The error message that is emitted
when one of the subports is attempted without +quartz still refers
to "gtk-osx-application" rather than the subport name. Changing
${name} to ${name}-${gtk_version} in that message fixes the issue.<br>
<br>
Otherwise looks good. <br>
<br>
Dave<br>
</body>
</html>