<!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>[138230] trunk/dports/gnome/gpodder/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/138230">138230</a></dd>
<dt>Author</dt> <dd>elelay@macports.org</dd>
<dt>Date</dt> <dd>2015-07-02 12:04:54 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gpodder: drop python26, depend on py27-gtk-osx-application-gtk2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegpodderPortfile">trunk/dports/gnome/gpodder/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegpodderPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gpodder/Portfile (138229 => 138230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gpodder/Portfile        2015-07-02 18:59:53 UTC (rev 138229)
+++ trunk/dports/gnome/gpodder/Portfile        2015-07-02 19:04:54 UTC (rev 138230)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name gpodder
</span><span class="cx"> version 3.8.4
</span><span class="lines">@@ -28,76 +27,33 @@
</span><span class="cx"> port:intltool
</span><span class="cx">
</span><span class="cx"> depends_lib port:vorbis-tools\
</span><del>- port:lame
</del><ins>+ port:lame \
+ port:py27-feedparser \
+ port:dbus-python27 \
+ port:py27-mygpoclient \
+ port:py27-pygtk
</ins><span class="cx">
</span><del>-set my_python "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
-set python.version "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
-set python.branch "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
</del><ins>+set python.version 27
+set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
+set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
</ins><span class="cx">
</span><del>-variant python26 conflicts python27 description {Use Python 2.6} {
- set python.version 26
- set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
-
- set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
-
- depends_lib-append port:py${python.version}-feedparser \
- port:dbus-python${python.version} \
- port:py${python.version}-mygpoclient \
- port:py${python.version}-pygtk
-
- post-patch {
- reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
- }
-
- # install in python 2.6 prefix, see bug #22522
- destroot.args PREFIX=${my_python}
-
- # Install the 2.6 apps in the standard path :
- # the 2 variants can't be active simultaneously.
- post-destroot {
-         foreach {app} {gpodder gpo gpodder-backup} {
-                 ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
- }
- }
</del><ins>+post-patch {
+ reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python26 description {Use Python 2.7} {
- set python.version 27
- set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
</del><ins>+# install in python 2.7 prefix
+destroot.args PREFIX=${my_python}
</ins><span class="cx">
</span><del>- set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
-
- depends_lib-append port:py${python.version}-feedparser \
- port:dbus-python${python.version} \
- port:py${python.version}-mygpoclient \
- port:py${python.version}-pygtk
-
- post-patch {
- reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
</del><ins>+# Install the apps in the standard path :
+post-destroot {
+ foreach {app} {gpodder gpo gpodder-backup gpodder-migrate2tres} {
+ ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
</ins><span class="cx"> }
</span><del>-
- # install in python 2.7 prefix, see bug #22522
- destroot.args PREFIX=${my_python}
-
- # Install the 2.7 apps in the standard path :
- # the 2 variants can't be active simultaneously.
- post-destroot {
- foreach {app} {gpodder gpo gpodder-backup gpodder-migrate2tres} {
- ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
- }
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python26] && ![variant_isset python27]} {
- default_variants +python27
-}
-
</del><span class="cx"> variant quartz {
</span><del>- depends_lib-append port:gtk-osx-application
</del><ins>+ depends_lib-append port:py27-gtk-osx-application-gtk2
</ins><span class="cx">
</span><del>- # gPodder is still using pygtk, not the gtk3 bindings
- require_active_variants gtk-osx-application "" gtk3
-
</del><span class="cx"> post-destroot {
</span><span class="cx">         # Command-XX shortcuts in gPodder menus
</span><span class="cx">         system "/usr/bin/xsltproc -o ${destroot}${my_python}/share/gpodder/ui/gtk/gpodder.ui \
</span><span class="lines">@@ -106,9 +62,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant html_notes description {Use WebkitGtk+ to show episode notes in HTML format} {
</span><del>-        if {[variant_isset python26] || [variant_isset python27]} {
</del><span class="cx">                 depends_lib-append port:py${python.version}-webkitgtk
</span><del>-        }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="lines">@@ -118,11 +72,7 @@
</span><span class="cx"> post-destroot {
</span><span class="cx">
</span><span class="cx"> # build a MacOS X application
</span><del>-        if {[variant_isset python26] || [variant_isset python27]} {
-                set install_path "${my_python}"
-        } else {
-                set install_path "${prefix}"
-        }
</del><ins>+ set install_path "${my_python}"
</ins><span class="cx">
</span><span class="cx">         system "cd ${worksrcpath}/tools/mac-osx && make \
</span><span class="cx">                 GPODDERSCRIPT=\"${install_path}/bin/gpodder\"\
</span><span class="lines">@@ -138,13 +88,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> notes "
</span><del>-
-****
-**** To subscribe to YouTube user feeds, you must setup a google developer
-**** project, enable the YouTube v3 api, generate a public api key (browser
-**** type, no origin url) and copy-paste this key to the gPodder preferences.
-**** Then you'll be able to subscribe to e.g. yt:gobelins
-****
</del><ins>+To subscribe to YouTube user feeds (e.g. yt:gobelins),
+you must enter a google API key.
+See http://wiki.gpodder.org/wiki/Youtube for detailed instructions.
</ins><span class="cx"> "
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre>
</div>
</div>
</body>
</html>