<!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>[132122] trunk/dports/net/avahi/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/132122">132122</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-01-23 13:51:12 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>avahi: use gobject_introspection portgroup, drop python variants and just configure for python27, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetavahiPortfile">trunk/dports/net/avahi/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetavahiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/avahi/Portfile (132121 => 132122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/avahi/Portfile 2015-01-23 21:29:36 UTC (rev 132121)
+++ trunk/dports/net/avahi/Portfile 2015-01-23 21:51:12 UTC (rev 132122)
</span><span class="lines">@@ -3,10 +3,11 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup active_variants 1.1
</span><ins>+PortGroup gobject_introspection 1.0
</ins><span class="cx">
</span><span class="cx"> name avahi
</span><span class="cx"> version 0.6.31
</span><del>-revision 12
</del><ins>+revision 13
</ins><span class="cx"> categories net devel
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license LGPL-2.1+
</span><span class="lines">@@ -55,9 +56,10 @@
</span><span class="cx"> depends_lib port:expat \
</span><span class="cx"> port:gdbm \
</span><span class="cx"> port:gettext \
</span><del>- port:gobject-introspection \
</del><span class="cx"> port:libdaemon
</span><span class="cx">
</span><ins>+gobject_introspection yes
+
</ins><span class="cx"> set avahiuser avahi
</span><span class="cx">
</span><span class="cx"> configure.args --disable-autoipd \
</span><span class="lines">@@ -69,15 +71,11 @@
</span><span class="cx"> --enable-compat-libdns_sd \
</span><span class="cx"> --disable-gtk3 \
</span><span class="cx"> --disable-xmltoman \
</span><del>- --enable-introspection \
</del><span class="cx"> --disable-gtk \
</span><span class="cx"> --disable-pygtk \
</span><span class="cx"> --disable-tests \
</span><span class="cx"> --with-avahi-priv-access-group=${avahiuser}
</span><span class="cx">
</span><del>-# gobject-introspection uses g-ir-scanner, which uses $CC from env
-build.args-append CC="${configure.cc} ${configure.cc_archflags}"
-
</del><span class="cx"> # __APPLE_USE_RFC_2292 should be removed once avhi is updated to support RFC 3542
</span><span class="cx"> configure.cppflags-append -L${prefix}/lib -D__APPLE_USE_RFC_2292
</span><span class="cx">
</span><span class="lines">@@ -147,32 +145,24 @@
</span><span class="cx"> configure.args-delete --disable-gtk3
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+default_variants +gtk +gtk3
+
</ins><span class="cx"> variant qt4 description {Build with Qt4} {
</span><span class="cx"> depends_lib-append port:qt4-mac
</span><span class="cx">
</span><span class="cx"> configure.args-delete --disable-qt4
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python26 conflicts python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
</del><ins>+# just use python27 with no python variants
</ins><span class="cx">
</span><del>- depends_lib-append port:dbus-python26 \
- port:py26-gdbm
- if [variant_isset gtk] {
- depends_lib-append port:py26-pygtk
- configure.args-delete --disable-pygtk
- }
-}
</del><ins>+configure.python ${prefix}/bin/python2.7
</ins><span class="cx">
</span><del>-variant python27 conflicts python26 description {Use python 2.7} {
- configure.python ${prefix}/bin/python2.7
</del><ins>+depends_lib-append port:dbus-python27 \
+ port:py27-gdbm
</ins><span class="cx">
</span><del>- depends_lib-append port:dbus-python27 \
- port:py27-gdbm
- if [variant_isset gtk] {
- depends_lib-append port:py27-pygtk
- configure.args-delete --disable-pygtk
- }
</del><ins>+if [variant_isset gtk] {
+ depends_lib-append port:py27-pygtk
+ configure.args-delete --disable-pygtk
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant x11 {
</span><span class="lines">@@ -183,11 +173,6 @@
</span><span class="cx"> require_active_variants gtk2 quartz x11
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +gtk +gtk3
-
-if {![variant_isset python26]} {
- default_variants-append +python27
-}
</del><span class="cx"> catch {
</span><span class="cx"> if {[active_variants gtk2 quartz x11]} {
</span><span class="cx"> default_variants-append +quartz
</span></span></pre>
</div>
</div>
</body>
</html>