<!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>[122047] trunk/dports/net/pidgin</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/122047">122047</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-13 09:02:36 -0700 (Sun, 13 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>pidgin: break out libpurple into new subport, increment revision.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetpidginPortfile">trunk/dports/net/pidgin/Portfile</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsnetpidgin">trunk/dports/net/pidgin/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetpidgin"></a>
<div class="propset"><h4>Property changes: trunk/dports/net/pidgin</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="trunkdportsnetpidginPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/pidgin/Portfile (122046 => 122047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/pidgin/Portfile        2014-07-13 14:27:37 UTC (rev 122046)
+++ trunk/dports/net/pidgin/Portfile        2014-07-13 16:02:36 UTC (rev 122047)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                pidgin
</span><span class="cx"> version             2.10.7
</span><del>-revision            8
</del><ins>+revision            9
</ins><span class="cx"> categories          net
</span><span class="cx"> platforms           darwin
</span><span class="cx"> license             GPL-2+
</span><span class="lines">@@ -30,25 +30,45 @@
</span><span class="cx"> depends_build       port:pkgconfig \
</span><span class="cx">                     port:intltool
</span><span class="cx"> 
</span><del>-depends_lib         port:audiofile \
</del><ins>+depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:libxml2 \
</ins><span class="cx">                     port:gconf \
</span><ins>+                    port:libidn \
+                    port:gnutls
+
+if {${subport} ne &quot;libpurple&quot;} {
+    depends_lib-append \
+                    port:libpurple \
+                    port:audiofile \
</ins><span class="cx">                     port:gtk2 \
</span><del>-                    port:gnutls \
</del><span class="cx">                     port:libao \
</span><del>-                    port:libidn \
-                    port:libxml2 \
</del><span class="cx">                     port:nspr \
</span><span class="cx">                     port:nss \
</span><span class="cx">                     port:perl5.16
</span><span class="cx"> 
</span><del>-# nss is not universal
-universal_variant   no
</del><ins>+    post-destroot {
+        foreach file [glob -nocomplain -directory ${destroot}${prefix}/bin purple-*] {
+            delete $file
+        }
+        foreach file [glob -nocomplain -directory ${destroot}${prefix}/lib libpurple* pkgconfig purple-2] {
+            delete $file
+        }
+        delete ${destroot}${prefix}/include/libpurple \
+               ${destroot}${prefix}/share/aclocal \
+               ${destroot}${prefix}/share/man/man3/Purple.3pm \
+               ${destroot}${prefix}/share/purple \
+               ${destroot}${prefix}/share/sounds/purple \
+    }
+}
</ins><span class="cx"> 
</span><span class="cx"> patchfiles          patch-configure.ac.diff \
</span><span class="cx">                     patch-libpurple-internal.h.diff
</span><span class="cx"> 
</span><span class="cx"> use_autoreconf      yes
</span><span class="cx"> 
</span><ins>+# --disable-dependency-tracking was added because a +universal perl will result in
+# PERL_CFLAGS containing multiple -arch arguments... this is the easiest workaround
+
</ins><span class="cx"> configure.args      --disable-avahi \
</span><span class="cx">                     --disable-consoleui \
</span><span class="cx">                     --disable-farstream \
</span><span class="lines">@@ -71,67 +91,83 @@
</span><span class="cx">                     --disable-dependency-tracking \
</span><span class="cx">                     --without-x
</span><span class="cx"> 
</span><del>-# --disable-dependency-tracking was added because a +universal perl will result in
-# PERL_CFLAGS containing multiple -arch arguments... this is the easiest workaround
-
</del><span class="cx"> configure.args-append ac_cv_path_perlpath=${prefix}/bin/perl5.16
</span><span class="cx"> 
</span><span class="cx"> configure.ldflags-append    -bind_at_load
</span><span class="cx"> configure.cppflags-append   -no-cpp-precomp
</span><span class="cx"> 
</span><del>-variant finch_only requires finch description {Build without pidgin} {
-    configure.args-append   --disable-gtkui
</del><ins>+subport libpurple {
+    configure.args-append   --disable-gtkui \
+                            --disable-pixmaps-install \
+                            --disable-nls
+    pre-activate {
+        if {![catch {set installed [lindex [registry_active pidgin] 0]}]} {
+            set _version [lindex $installed 1]
+            if {[vercmp $_version 2.10.9] &lt; 0} {
+                registry_deactivate_composite pidgin &quot;&quot; [list ports_nodepcheck 1]
+            }
+        }
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant finch description {Build with finch} {
-    configure.args-delete   --disable-consoleui
-    patchfiles-append          patch-finch_libgnt_Makefile.in.diff patch-finch_libgnt_gntwm.c
-}
</del><ins>+if {${subport} eq $name} {
</ins><span class="cx"> 
</span><del>-post-destroot {
-    fs-traverse file ${destroot}${prefix}/lib/perl5 {
-        if {[file tail ${file}] == &quot;perllocal.pod&quot;} {
-            delete ${file}
-        }
</del><ins>+    # nss is not universal
+    universal_variant   no
+
+    variant finch_only requires finch description {Build without pidgin} {
+        configure.args-append   --disable-gtkui
</ins><span class="cx">     }
</span><del>-}
</del><span class="cx"> 
</span><del>-variant x11 conflicts no_x11 quartz {
-    depends_lib-append      port:xorg-libX11 \
-                            port:xorg-libXext \
-                            port:xorg-libXScrnSaver \
-                            port:xorg-libice \
-                            port:xorg-libsm
</del><ins>+    variant finch description {Build with finch} {
+        configure.args-delete   --disable-consoleui
+        patchfiles-append       patch-finch_libgnt_Makefile.in.diff patch-finch_libgnt_gntwm.c
+    }
</ins><span class="cx"> 
</span><del>-    configure.args-delete   --without-x \
-                            --disable-screensaver \
-                            --disable-sm
</del><ins>+    variant x11 conflicts no_x11 quartz {
+        depends_lib-append      port:xorg-libX11 \
+                                port:xorg-libXext \
+                                port:xorg-libXScrnSaver \
+                                port:xorg-libice \
+                                port:xorg-libsm
</ins><span class="cx"> 
</span><del>-    configure.args-append   --with-x \
-                            --x-includes=${prefix}/include \
-                            --x-libraries=${prefix}/lib \
-                            --enable-screensaver \
-                            --enable-sm
-}
</del><ins>+        configure.args-delete   --without-x \
+                                --disable-screensaver \
+                                --disable-sm
</ins><span class="cx"> 
</span><del>-# Legacy no_x11 variant to be removed after May 2015.
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
</del><ins>+        configure.args-append   --with-x \
+                                --x-includes=${prefix}/include \
+                                --x-libraries=${prefix}/lib \
+                                --enable-screensaver \
+                                --enable-sm
+    }
</ins><span class="cx"> 
</span><del>-if {[variant_isset no_x11] || [variant_isset quartz]} {
-    default_variants -x11
-} else {
-    default_variants +x11
-}
</del><ins>+    # Legacy no_x11 variant to be removed after May 2015.
+    variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
</ins><span class="cx"> 
</span><del>-variant quartz conflicts x11 {
-    configure.args-append   --disable-gestures
-}
</del><ins>+    if {[variant_isset no_x11] || [variant_isset quartz]} {
+        default_variants -x11
+    } else {
+        default_variants +x11
+    }
</ins><span class="cx"> 
</span><del>-variant spellcheck description {Allow spell checking} {
-    depends_lib-append      port:gtkspell2
-    configure.args-delete   --disable-gtkspell
</del><ins>+    variant quartz conflicts x11 {
+        configure.args-append   --disable-gestures
+    }
+
+    variant spellcheck description {Allow spell checking} {
+        depends_lib-append      port:gtkspell2
+        configure.args-delete   --disable-gtkspell
+    }
+
+    post-activate {
+        system &quot;dbus-uuidgen --ensure&quot;
+        system &quot;${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor&quot;
+        system &quot;export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` &amp;&amp; \
+            gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas&quot;
+    }
</ins><span class="cx"> }
</span><del>-
</del><ins>+    
</ins><span class="cx"> # Python is only required if --enable-dbus is used, and only for
</span><span class="cx"> # the build process to generate the dbus code, not for running pidgin.
</span><span class="cx"> 
</span><span class="lines">@@ -148,12 +184,13 @@
</span><span class="cx"> if {![variant_isset python26]} {
</span><span class="cx">     default_variants    +python27
</span><span class="cx"> }
</span><del>-    
-post-activate {
-    system &quot;dbus-uuidgen --ensure&quot;
-    system &quot;${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor&quot;
-    system &quot;export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` &amp;&amp; \
-        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas&quot;
</del><ins>+
+post-destroot {
+    fs-traverse file ${destroot}${prefix}/lib/perl5 {
+        if {[file tail ${file}] == &quot;perllocal.pod&quot;} {
+            delete ${file}
+        }
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> livecheck.type      regex
</span></span></pre>
</div>
</div>

</body>
</html>