<!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>[115893] 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/115893">115893</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-13 11:43:03 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py2[67]-exiv2: replace with new unified port py-exiv2, use active_variants port group (#33153).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyexiv2Portfile">trunk/dports/python/py-exiv2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-exiv2/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/python/py26-exiv2/</li>
<li>trunk/dports/python/py27-exiv2/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyexiv2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-exiv2/Portfile (115890 => 115893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py27-exiv2/Portfile 2014-01-13 17:02:37 UTC (rev 115890)
+++ trunk/dports/python/py-exiv2/Portfile 2014-01-13 19:43:03 UTC (rev 115893)
</span><span class="lines">@@ -2,17 +2,14 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup python 1.0
+PortGroup active_variants 1.1
</ins><span class="cx">
</span><del>-name py27-exiv2
-#
-# conflict due to dependency on
-# Python version specific variant of boost
-#
-conflicts py26-exiv2
</del><ins>+name py-exiv2
</ins><span class="cx"> platforms darwin
</span><span class="cx"> set my_name pyexiv2
</span><span class="cx"> version 0.3.2
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories python graphics
</span><span class="cx"> license GPL-2
</span><span class="lines">@@ -31,38 +28,31 @@
</span><span class="cx"> checksums rmd160 cbc53e6f45b0f4251b90bfb6ffab8c659463ac5d \
</span><span class="cx"> sha256 0abc117c6afa71f54266cb91979a5227f60361db1fcfdb68ae9615398d7a2127
</span><span class="cx">
</span><del>-depends_build port:scons
</del><ins>+python.versions 26 27
+python.default_version 27
</ins><span class="cx">
</span><del>-depends_lib port:boost \
- port:exiv2 \
- port:python27
</del><ins>+if {$subport != $name} {
+ depends_build-append port:scons
</ins><span class="cx">
</span><ins>+ depends_lib-append port:boost \
+ port:exiv2
+
+ patchfiles patch-src-SConscript.diff
+
</ins><span class="cx"> #
</span><del>-# Make sure that boost is installed with the correct Python variant
</del><ins>+# conflict due to dependency on
+# Python version specific variant of boost
</ins><span class="cx"> #
</span><del>-
-pre-build {
- set boost_python_lib ${prefix}/lib/libboost_python-mt.dylib
- set boost_python_version "0"
- if {[file exists ${boost_python_lib}]} {
- set boost_python_version [exec /usr/bin/otool -L ${boost_python_lib} | /usr/bin/grep Python | /usr/bin/sed -e "s|^.*Versions/||" -e "s|/.*||"]
</del><ins>+ if {${python.version} == 26} {
+ conflicts py27-exiv2
+ } else {
+ conflicts py26-exiv2
</ins><span class="cx"> }
</span><del>- if {${boost_python_version} != "2.7"} {
- ui_error "This port requires 'boost +python27'. Please install as follows:"
- ui_error " sudo port install boost +python27."
- return -code error
- }
-}
-
-patchfiles patch-src-SConscript.diff
-
-use_configure no
-
</del><span class="cx"> #
</span><del>-# universal_variant is not set by default if configure is disabled
</del><ins>+# Make sure that boost is installed with the correct Python variant
</ins><span class="cx"> #
</span><span class="cx">
</span><del>-universal_variant yes
</del><ins>+ require_active_variants boost python${python.version}
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # scons (a python script) uses python builtin procedures
</span><span class="lines">@@ -70,43 +60,49 @@
</span><span class="cx"> # depends on the version of python used to run scons
</span><span class="cx"> #
</span><span class="cx">
</span><del>-build.cmd ${prefix}/bin/python2.7 ${prefix}/bin/scons
-build.target
-build.args-append \
- BOOSTLIB=boost_python-mt \
- PYTHONLIB=python2.7
-build.env-append \
- PREFIX=${prefix} \
- CXX=${configure.cxx} \
-
-if {[variant_isset universal]} {
</del><ins>+ build.cmd ${python.bin} ${prefix}/bin/scons
+ build.target
+ build.args-append \
+ BOOSTLIB=boost_python-mt \
+ PYTHONLIB=python${python.branch}
</ins><span class="cx"> build.env-append \
</span><ins>+ PREFIX=${prefix} \
+ CXX=${configure.cxx} \
+
+ pre-build {
+ if {[variant_isset universal]} {
+ build.env-append \
</ins><span class="cx"> CXXFLAGS="${configure.universal_cxxflags} -I${prefix}/include" \
</span><span class="cx"> LDFLAGS="${configure.universal_ldflags} -L${prefix}/lib"
</span><del>-} else {
- build.env-append \
</del><ins>+ } else {
+ build.env-append \
</ins><span class="cx"> CXXFLAGS="-I${prefix}/include" \
</span><span class="cx"> LDFLAGS="-L${prefix}/lib"
</span><del>-}
</del><ins>+ }
+ }
</ins><span class="cx">
</span><del>-destroot.cmd ${prefix}/bin/python2.7 ${prefix}/bin/scons
-destroot.args-append \
- BOOSTLIB=boost_python-mt \
- PYTHONLIB=python2.7
-destroot.env-append \
- PREFIX=${prefix}\
- CXX=${configure.cxx} \
-
-if {[variant_isset universal]} {
</del><ins>+ destroot.cmd ${python.bin} ${prefix}/bin/scons
+ destroot.destdir DESTDIR=${destroot}
+ destroot.args-append \
+ BOOSTLIB=boost_python-mt \
+ PYTHONLIB=python${python.branch}
</ins><span class="cx"> destroot.env-append \
</span><del>- CXXFLAGS="${configure.universal_cxxflags} -I${prefix}/include" \
- LDFLAGS="${configure.universal_ldflags} -L${prefix}/lib"
</del><ins>+ PREFIX=${prefix}\
+ CXX=${configure.cxx} \
+
+ if {[variant_isset universal]} {
+ destroot.env-append \
+ CXXFLAGS="${configure.universal_cxxflags} -I${prefix}/include" \
+ LDFLAGS="${configure.universal_ldflags} -L${prefix}/lib"
+ } else {
+ destroot.env-append \
+ CXXFLAGS="-I${prefix}/include" \
+ LDFLAGS="-L${prefix}/lib"
+ }
+
+ livecheck.type regex
+ livecheck.url http://tilloy.net/dev/pyexiv2/download.html
+ livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</ins><span class="cx"> } else {
</span><del>- destroot.env-append \
- CXXFLAGS="-I${prefix}/include" \
- LDFLAGS="-L${prefix}/lib"
</del><ins>+ livecheck.type none
</ins><span class="cx"> }
</span><del>-
-livecheck.type regex
-livecheck.url http://tilloy.net/dev/pyexiv2/download.html
-livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</del></span></pre>
</div>
</div>
</body>
</html>