<!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>[123616] trunk/dports/python</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/123616">123616</a></dd>
<dt>Author</dt> <dd>petr@macports.org</dd>
<dt>Date</dt> <dd>2014-08-11 11:25:45 -0700 (Mon, 11 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>{py-}impressive: rename port, cleanup, provide python variants and default to python27</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonimpressivePortfile">trunk/dports/python/impressive/Portfile</a></li>
<li><a href="#trunkdportspythonpyimpressivePortfile">trunk/dports/python/py-impressive/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/impressive/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonimpressivePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/impressive/Portfile (123586 => 123616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-impressive/Portfile        2014-08-11 06:15:55 UTC (rev 123586)
+++ trunk/dports/python/impressive/Portfile        2014-08-11 18:25:45 UTC (rev 123616)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> PortGroup           python 1.0
</span><span class="cx"> 
</span><del>-name                py-impressive
</del><ins>+name                impressive
</ins><span class="cx"> version             0.10.5
</span><span class="cx"> categories-append   graphics
</span><span class="cx"> license             GPL-2
</span><span class="lines">@@ -29,37 +29,62 @@
</span><span class="cx">                     sha1    63163745e6b2a648f156c5de6ff8235d5c5c90b4 \
</span><span class="cx">                     rmd160  9d7ab85aa0dafad387170e44c06d42aad4e6a395
</span><span class="cx"> 
</span><del>-python.versions 26
</del><ins>+python.versions     26 27
</ins><span class="cx"> 
</span><del>-if {${name} ne ${subport}} {
-    depends_lib     port:py${python.version}-opengl \
</del><ins>+# create python variants
+foreach ver ${python.versions} {
+     set variant_line {variant python${ver} description &quot;Use python${ver} and packages from MacPorts&quot;}
+
+    foreach over ${python.versions} {
+        if {${ver} == ${over}} {
+            continue
+        }
+        append variant_line &quot; conflicts python${over}&quot;
+    }
+    append variant_line { {}}
+    eval $variant_line
+}
+
+# set default python variant
+set variant_none true
+foreach ver ${python.versions} {
+    if {[variant_isset python${ver}]} {
+        set variant_none [expr $variant_none &amp;&amp; ![variant_isset python${ver}]]
+    }
+}
+if {${variant_none}} {
+    default_variants-append &quot;+python${python.default_version}&quot;
+}
+
+# python variant settings
+foreach ver ${python.versions} {
+    if {[variant_isset python${ver}]} {python.version  ${ver}}
+}
+
+depends_lib-append  port:python${python.version} \
+                    port:py${python.version}-opengl \
</ins><span class="cx">                     port:py${python.version}-game \
</span><span class="cx">                     path:${python.pkgd}/PIL:py${python.version}-Pillow \
</span><span class="cx">                     port:xpdf \
</span><span class="cx">                     port:ghostscript \
</span><span class="cx">                     port:pdftk
</span><span class="cx"> 
</span><del>-    post-patch {
-        reinplace &quot;s|/usr/bin/env python|${python.bin}|&quot; ${worksrcpath}/impressive.py
-    }
-    build {}
</del><ins>+post-patch {
+    reinplace &quot;s|/usr/bin/env python|${python.bin}|&quot; \
+        ${worksrcpath}/impressive.py
+}
+build {}
</ins><span class="cx"> 
</span><del>-    python.link_binaries no
-    # this is bad, a py27-impressive would conflict with py26-impressive
-    # make non-conflicting or change name to just 'impressive'
-    destroot {
-        xinstall -d ${destroot}${prefix}/bin
-        xinstall -d ${destroot}${prefix}/share/impressive
-        xinstall -d ${destroot}${prefix}/share/doc/impressive
-        xinstall -m 775 ${worksrcpath}/impressive.py \
-                        ${worksrcpath}/demo.pdf \
-                        ${destroot}${prefix}/share/impressive
-        xinstall -m 644 ${worksrcpath}/impressive.1 \
-                        ${destroot}${prefix}/share/man/man1
-        xinstall -m 664 ${worksrcpath}/license.txt \
-                        ${worksrcpath}/changelog.txt \
-                        ${worksrcpath}/impressive.html \
-                        ${destroot}${prefix}/share/doc/impressive
-        ln -s ${prefix}/share/impressive/impressive.py ${destroot}${prefix}/bin/impressive
-    }
</del><ins>+destroot {
+    xinstall -m 775 ${worksrcpath}/impressive.py \
+        ${destroot}${prefix}/bin/impressive
+    xinstall -m 644 ${worksrcpath}/impressive.1 \
+        ${destroot}${prefix}/share/man/man1
+    xinstall -m 664 -W ${worksrcpath} \
+        license.txt \
+        changelog.txt \
+        impressive.html \
+            ${destroot}${prefix}/share/doc/impressive
+    xinstall -m 664 ${worksrcpath}/demo.pdf \
+            ${destroot}${prefix}/share/doc/impressive/examples
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpyimpressivePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-impressive/Portfile (123615 => 123616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-impressive/Portfile        2014-08-11 18:22:27 UTC (rev 123615)
+++ trunk/dports/python/py-impressive/Portfile        2014-08-11 18:25:45 UTC (rev 123616)
</span><span class="lines">@@ -2,64 +2,19 @@
</span><span class="cx"> # $Id$
</span><span class="cx"> 
</span><span class="cx"> PortSystem          1.0
</span><del>-PortGroup           python 1.0
</del><span class="cx"> 
</span><ins>+# This port can be removed on 2015-08-11
+replaced_by         impressive
+PortGroup           obsolete 1.0
+
</ins><span class="cx"> name                py-impressive
</span><span class="cx"> version             0.10.5
</span><del>-categories-append   graphics
</del><ins>+revision            1
+categories          python graphics
</ins><span class="cx"> license             GPL-2
</span><del>-maintainers         nomaintainer
-platforms           darwin
-supported_archs     noarch
</del><span class="cx"> 
</span><del>-description         Slide presentation tool
-long_description \
-    Impressive is a program that displays presentation slides.       \
-    But unlike OpenOffice.org Impress or other similar applications, \
-    it does so with style. Smooth alpha-blended slide transitions    \
-    are provided for the sake of eye candy, but in addition to this, \
-    Impressive offers some unique tools that are really useful       \
-    for presentations.
-
</del><ins>+description         Stub for renamed port for Python app Impressive
+long_description    ${description}
</ins><span class="cx"> homepage            http://impressive.sourceforge.net/
</span><del>-master_sites        sourceforge:impressive
</del><span class="cx"> 
</span><del>-distname            Impressive-${version}
-checksums           md5     1c902d584b489c5fbf2c6d3aed0b3407         \
-                    sha1    63163745e6b2a648f156c5de6ff8235d5c5c90b4 \
-                    rmd160  9d7ab85aa0dafad387170e44c06d42aad4e6a395
-
-python.versions 26
-
-if {${name} ne ${subport}} {
-    depends_lib     port:py${python.version}-opengl \
-                    port:py${python.version}-game \
-                    path:${python.pkgd}/PIL:py${python.version}-Pillow \
-                    port:xpdf \
-                    port:ghostscript \
-                    port:pdftk
-
-    post-patch {
-        reinplace &quot;s|/usr/bin/env python|${python.bin}|&quot; ${worksrcpath}/impressive.py
-    }
-    build {}
-
-    python.link_binaries no
-    # this is bad, a py27-impressive would conflict with py26-impressive
-    # make non-conflicting or change name to just 'impressive'
-    destroot {
-        xinstall -d ${destroot}${prefix}/bin
-        xinstall -d ${destroot}${prefix}/share/impressive
-        xinstall -d ${destroot}${prefix}/share/doc/impressive
-        xinstall -m 775 ${worksrcpath}/impressive.py \
-                        ${worksrcpath}/demo.pdf \
-                        ${destroot}${prefix}/share/impressive
-        xinstall -m 644 ${worksrcpath}/impressive.1 \
-                        ${destroot}${prefix}/share/man/man1
-        xinstall -m 664 ${worksrcpath}/license.txt \
-                        ${worksrcpath}/changelog.txt \
-                        ${worksrcpath}/impressive.html \
-                        ${destroot}${prefix}/share/doc/impressive
-        ln -s ${prefix}/share/impressive/impressive.py ${destroot}${prefix}/bin/impressive
-    }
-}
</del><ins>+subport {py26-impressive} {}
</ins></span></pre>
</div>
</div>

</body>
</html>