<!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>[124022] trunk/dports/sysutils</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/124022">124022</a></dd>
<dt>Author</dt> <dd>afb@macports.org</dd>
<dt>Date</dt> <dd>2014-08-17 06:40:09 -0700 (Sun, 17 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>upgrade to python27 and perl5.16</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilscreaterepoPortfile">trunk/dports/sysutils/createrepo/Portfile</a></li>
<li><a href="#trunkdportssysutilsrpmPortfile">trunk/dports/sysutils/rpm/Portfile</a></li>
<li><a href="#trunkdportssysutilsrpm45Portfile">trunk/dports/sysutils/rpm45/Portfile</a></li>
<li><a href="#trunkdportssysutilsrpm52Portfile">trunk/dports/sysutils/rpm52/Portfile</a></li>
<li><a href="#trunkdportssysutilsrpm53Portfile">trunk/dports/sysutils/rpm53/Portfile</a></li>
<li><a href="#trunkdportssysutilssmartPortfile">trunk/dports/sysutils/smart/Portfile</a></li>
<li><a href="#trunkdportssysutilsyumPortfile">trunk/dports/sysutils/yum/Portfile</a></li>
<li><a href="#trunkdportssysutilsyumcreaterepoPortfile">trunk/dports/sysutils/yum-createrepo/Portfile</a></li>
<li><a href="#trunkdportssysutilsyumutilsPortfile">trunk/dports/sysutils/yum-utils/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilscreaterepoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/createrepo/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/createrepo/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/createrepo/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> name createrepo
</span><span class="cx"> conflicts yum-createrepo
</span><span class="cx"> version 0.4.11
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories sysutils
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers afb
</span><span class="lines">@@ -23,21 +23,21 @@
</span><span class="cx"> patch-dumpMetadata.py patch-genpkgmetadata.py \
</span><span class="cx"> patch-readMetadata.py patch-modifyrepo.py
</span><span class="cx">
</span><del>-depends_run port:python25 port:rpm port:py25-libxml2 port:py25-yum-metadata-parser
</del><ins>+depends_run port:python27 port:rpm port:py27-libxml2 port:py27-yum-metadata-parser
</ins><span class="cx"> # this should be depends_test:
</span><del>-depends_build port:py25-checker
</del><ins>+depends_build port:py27-checker
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|__PREFIX__|${prefix}|g" \
</span><span class="cx"> ${worksrcpath}/bin/createrepo ${worksrcpath}/bin/modifyrepo
</span><del>- reinplace "s|__PYTHON__|${prefix}/bin/python2.5|g" \
</del><ins>+ reinplace "s|__PYTHON__|${prefix}/bin/python2.7|g" \
</ins><span class="cx"> ${worksrcpath}/dumpMetadata.py ${worksrcpath}/genpkgmetadata.py \
</span><span class="cx"> ${worksrcpath}/readMetadata.py ${worksrcpath}/modifyrepo.py
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-build.args prefix=${prefix} PYTHON="${prefix}/bin/python2.5"
</del><ins>+build.args prefix=${prefix} PYTHON="${prefix}/bin/python2.7"
</ins><span class="cx">
</span><span class="cx"> destroot.args prefix=${prefix} INSTALL="/usr/bin/install -p" INSTALL_MODULES="/usr/bin/install -m 755"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssysutilsrpmPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/rpm/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name rpm
</span><span class="cx"> version 4.4.9
</span><del>-revision 16
</del><ins>+revision 17
</ins><span class="cx"> platforms darwin freebsd linux
</span><span class="cx"> license GPL-2 LGPL-2
</span><span class="cx"> categories sysutils archivers
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> master_sites ${homepage}/files/${name}/${name}-4.4
</span><span class="cx"> checksums md5 210b768006e7d88dd8a3bcd498ea27f6
</span><span class="cx">
</span><del>-depends_build port:python25 port:perl5.8
</del><ins>+depends_build port:python27 port:perl5.16
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gettext \
</span><span class="cx"> port:popt port:sqlite3 port:beecrypt \
</span><span class="lines">@@ -37,12 +37,12 @@
</span><span class="cx"> configure.args --disable-nls --without-javaglue --without-included-gettext \
</span><span class="cx"> --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
</span><span class="cx"> --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
</span><del>- --with-python=2.5 --with-perl=5.8 --without-apidocs \
</del><ins>+ --with-python=2.7 --with-perl=5.16 --without-apidocs \
</ins><span class="cx"> --sysconfdir=${prefix}/etc
</span><span class="cx">
</span><span class="cx"> configure.libs-append -liconv
</span><span class="cx">
</span><del>-configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8
</del><ins>+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16
</ins><span class="cx">
</span><span class="cx"> # needed because it checks for sqlite3_open in sqlite lib...
</span><span class="cx"> configure.env-append ac_cv_lib_sqlite_sqlite3_open=yes
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> --with-glob --enable-broken-chown \
</span><span class="cx"> --disable-rpath
</span><span class="cx">
</span><del>- configure.cppflags-append -I${frameworks_dir}/Python.framework/Versions/2.5/include/python2.5
</del><ins>+ configure.cppflags-append -I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> # Mac OS X specific changes
</span></span></pre></div>
<a id="trunkdportssysutilsrpm45Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/rpm45/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm45/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm45/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name rpm45
</span><span class="cx"> version 4.5
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> platforms darwin freebsd linux
</span><span class="cx"> categories sysutils archivers
</span><span class="cx"> license {LGPL-2.1 GPL-2}
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #worksrcdir rpm
</span><span class="cx">
</span><span class="cx"> depends_build port:expat port:neon \
</span><del>- port:python25 port:perl5.8 \
</del><ins>+ port:python27 port:perl5.16 \
</ins><span class="cx"> port:readline port:beecrypt \
</span><span class="cx"> port:libiconv port:gettext
</span><span class="cx">
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> configure.args --disable-nls --without-javaglue --without-included-gettext \
</span><span class="cx"> --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
</span><span class="cx"> --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
</span><del>- --with-python=2.5 --with-perl --without-apidocs \
</del><ins>+ --with-python=2.7 --with-perl --without-apidocs \
</ins><span class="cx"> --sysconfdir=${prefix}/etc/rpm
</span><span class="cx">
</span><del>-configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8
</del><ins>+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16
</ins><span class="cx">
</span><span class="cx"> # needed because it checks for sqlite3_open in sqlite lib...
</span><span class="cx"> configure.env-append ac_cv_lib_sqlite_sqlite3_open=yes
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx"> --with-glob --enable-broken-chown \
</span><span class="cx"> --disable-rpath
</span><span class="cx">
</span><del>- configure.cppflags-append -I${prefix}/include/python2.5
- configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5
</del><ins>+ configure.cppflags-append -I${prefix}/include/python2.7
+ configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> # Mac OS X specific changes
</span></span></pre></div>
<a id="trunkdportssysutilsrpm52Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/rpm52/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm52/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm52/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name rpm52
</span><span class="cx"> version 5.2.1
</span><del>-revision 6
</del><ins>+revision 7
</ins><span class="cx"> platforms darwin freebsd linux
</span><span class="cx"> license LGPL-2.1
</span><span class="cx"> categories sysutils archivers
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> worksrcdir rpm-${version}
</span><span class="cx">
</span><span class="cx"> depends_build port:expat port:neon \
</span><del>- port:python25 port:perl5.8 \
</del><ins>+ port:python27 port:perl5.16 \
</ins><span class="cx"> port:readline port:beecrypt \
</span><span class="cx"> port:libiconv port:gettext
</span><span class="cx">
</span><span class="lines">@@ -45,11 +45,11 @@
</span><span class="cx"> configure.args --disable-nls --without-javaglue --without-included-gettext \
</span><span class="cx"> --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
</span><span class="cx"> --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
</span><del>- --with-python=2.5 --with-perl --with-sqlite --with-dbapi=sqlite \
</del><ins>+ --with-python=2.7 --with-perl --with-sqlite --with-dbapi=sqlite \
</ins><span class="cx"> --with-xar=external --with-xz=external --with-pcre=external --with-uuid=external \
</span><span class="cx"> --without-apidocs --sysconfdir=${prefix}/etc --with-path-cfg=${prefix}/etc/rpm
</span><del>-configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8 \
- PERL=${prefix}/bin/perl5.8
</del><ins>+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16 \
+ PERL=${prefix}/bin/perl5.16
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> configure.args-append --with-js=internal --with-lua=internal --with-db=internal
</span><span class="lines">@@ -106,42 +106,6 @@
</span><span class="cx"> configure.args-append --with-apidocs
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python26 description { use python 2.6 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python26
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.6
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.6
-}
-
-variant python27 description { use python 2.7 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python27
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.7
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.7
-}
-
-variant perl5_10 description { use perl 5.10 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.10
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.10
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.10
-}
-
-variant perl5_12 description { use perl 5.12 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.12
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.12
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.12
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> # get the last modified tarball
</span><span class="cx"> livecheck.url ${master_sites}
</span></span></pre></div>
<a id="trunkdportssysutilsrpm53Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/rpm53/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm53/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm53/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name rpm53
</span><span class="cx"> version 5.3.11
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> set date 20110602
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> platforms darwin freebsd linux
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> worksrcdir rpm-${version}
</span><span class="cx">
</span><span class="cx"> depends_build port:expat port:neon \
</span><del>- port:python25 port:perl5.8 \
</del><ins>+ port:python27 port:perl5.16 \
</ins><span class="cx"> port:readline port:beecrypt \
</span><span class="cx"> port:libiconv port:gettext
</span><span class="cx">
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx"> configure.args --disable-nls --without-javaglue --without-included-gettext \
</span><span class="cx"> --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
</span><span class="cx"> --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
</span><del>- --with-python=2.5 --with-perl --with-sqlite --with-db=external \
</del><ins>+ --with-python=2.7 --with-perl --with-sqlite --with-db=external \
</ins><span class="cx"> --with-neon=external --with-beecrypt=external --with-popt=external \
</span><span class="cx"> --with-xar=external --with-xz=external --with-pcre=external --with-uuid=external \
</span><span class="cx"> --without-apidocs --sysconfdir=${prefix}/etc --with-path-cfg=${prefix}/etc/rpm
</span><del>-configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8 \
- PERL=${prefix}/bin/perl5.8
</del><ins>+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16 \
+ PERL=${prefix}/bin/perl5.16
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> configure.args-append --disable-openmp --with-lua=internal --with-syck=internal
</span><span class="lines">@@ -126,42 +126,6 @@
</span><span class="cx"> configure.args-append --with-apidocs
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python26 description { use python 2.6 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python26
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.6
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.6
-}
-
-variant python27 description { use python 2.7 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python27
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.7
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.7
-}
-
-variant perl5_10 description { use perl 5.10 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.10
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.10
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.10
-}
-
-variant perl5_12 description { use perl 5.12 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.12
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.12
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.12
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> # get the last modified tarball
</span><span class="cx"> livecheck.url ${master_sites}
</span></span></pre></div>
<a id="trunkdportssysutilssmartPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/smart/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/smart/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/smart/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name smart
</span><span class="cx"> version 1.4.1
</span><ins>+revision 1
</ins><span class="cx"> platforms darwin freebsd
</span><span class="cx"> license GPL-2+
</span><span class="cx"> categories sysutils archivers
</span><span class="lines">@@ -26,10 +27,10 @@
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> patchfiles patch-prefix.diff
</span><span class="cx">
</span><del>-depends_lib path:lib/python2.5/site-packages/rpm/__init__.py:rpm port:python25
</del><ins>+depends_lib path:lib/python2.7/site-packages/rpm/__init__.py:rpm port:python27
</ins><span class="cx"> ### by default, it will run --shell interface.
</span><span class="cx"> ### to run it with --gui, you will need:
</span><del>-#depends_run port:py25-gtk
</del><ins>+#depends_run port:py27-pygtk
</ins><span class="cx">
</span><span class="cx"> patch {
</span><span class="cx"> foreach patch $patchfiles {
</span><span class="lines">@@ -40,9 +41,9 @@
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-build.args-append PYTHON="${prefix}/bin/python2.5"
-destroot.args-append PYTHON="${prefix}/bin/python2.5"
-test.args-append PYTHON="${prefix}/bin/python2.5"
</del><ins>+build.args-append PYTHON="${prefix}/bin/python2.7"
+destroot.args-append PYTHON="${prefix}/bin/python2.7"
+test.args-append PYTHON="${prefix}/bin/python2.7"
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> destroot.keepdirs ${destroot}${prefix}/etc/smart/channels \
</span></span></pre></div>
<a id="trunkdportssysutilsyumPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/yum/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/yum/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/yum/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> name yum
</span><span class="cx"> version 3.2.29
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><ins>+revision 1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories sysutils archivers
</span><span class="cx"> maintainers mac.com:n3npq afb
</span><span class="lines">@@ -25,8 +26,8 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-prefix.diff patch-sqlutils.py patch-packages.py
</span><span class="cx">
</span><del>-depends_lib lib:librpm:rpm
-depends_build port:intltool
</del><ins>+depends_lib path:lib/python2.7/site-packages/rpm/__init__.py:rpm port:python27 port:py27-urlgrabber port:py27-libxml2 port:py27-yum-metadata-parser port:py27-iniparse port:py27-pygpgme
+depends_build port:intltool port:py27-nose
</ins><span class="cx">
</span><span class="cx"> set python.bin ""
</span><span class="cx">
</span><span class="lines">@@ -54,22 +55,6 @@
</span><span class="cx"> destroot.args-append PYTHON="${python.bin}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python25 conflicts python26 description "use python 2.5" {
- depends_lib-append port:python25 port:py25-celementtree port:py25-urlgrabber port:py25-libxml2 port:py25-yum-metadata-parser port:py25-iniparse port:py25-pygpgme
- depends_build-append port:py25-nose
- set python.bin ${prefix}/bin/python2.5
-}
-
-variant python26 conflicts python25 description "use python 2.6" {
- depends_lib-append port:python26 port:py26-celementtree port:py26-urlgrabber port:py26-libxml2 port:py26-yum-metadata-parser port:py26-iniparse port:py26-pygpgme
- depends_build-append port:py26-nose
- set python.bin ${prefix}/bin/python2.6
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python25
-}
-
</del><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d -m 755 ${destroot}${prefix}/etc/yum/repos.d
</span><span class="cx"> xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/headers
</span></span></pre></div>
<a id="trunkdportssysutilsyumcreaterepoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/yum-createrepo/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/yum-createrepo/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/yum-createrepo/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> name yum-createrepo
</span><span class="cx"> conflicts createrepo
</span><span class="cx"> version 0.9.8
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories sysutils
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers afb
</span><span class="lines">@@ -22,11 +22,11 @@
</span><span class="cx"> rmd160 aa6021d6cc3e01f8b7dde108a966210dd7480509
</span><span class="cx"> patchfiles patch-prefix.diff patch-sqlite.diff
</span><span class="cx">
</span><del>-depends_run port:python25 port:yum
</del><ins>+depends_run port:python27 port:yum
</ins><span class="cx"> # this should be depends_test:
</span><del>-depends_build port:py25-checker
</del><ins>+depends_build port:py27-checker
</ins><span class="cx">
</span><del>-set python.bin ${prefix}/bin/python2.5
</del><ins>+set python.bin ${prefix}/bin/python2.7
</ins><span class="cx">
</span><span class="cx"> patch {
</span><span class="cx"> foreach patch $patchfiles {
</span><span class="lines">@@ -40,18 +40,6 @@
</span><span class="cx"> build.args prefix=${prefix} PYTHON="${python.bin}"
</span><span class="cx"> destroot.args prefix=${prefix} PYTHON="${python.bin}" INSTALL="/usr/bin/install -p" INSTALL_MODULES="/usr/bin/install -m 755"
</span><span class="cx">
</span><del>-variant python26 description "use python 2.6 instead of python 2.5" {
- depends_run-delete port:python25
- depends_run-append port:python26
- depends_build-delete port:py25-checker
- depends_build-append port:py26-checker
- set python.bin ${prefix}/bin/python2.6
- build.args-delete PYTHON="${prefix}/bin/python2.5"
- build.args-append PYTHON="${prefix}/bin/python2.6"
- destroot.args-delete PYTHON="${prefix}/bin/python2.5"
- destroot.args-append PYTHON="${prefix}/bin/python2.6"
-}
-
</del><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssysutilsyumutilsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/yum-utils/Portfile (124021 => 124022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/yum-utils/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/yum-utils/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name yum-utils
</span><span class="cx"> version 1.1.17
</span><ins>+revision 1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories sysutils
</span><span class="cx"> maintainers afb
</span><span class="lines">@@ -20,12 +21,12 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-prefix.diff
</span><span class="cx">
</span><del>-depends_lib port:python24 port:yum
</del><ins>+depends_lib port:python27 port:yum
</ins><span class="cx">
</span><span class="cx"> patch {
</span><span class="cx"> foreach patch $patchfiles {
</span><span class="cx"> system "cd '${workpath}/${distname}' && \
</span><del>- sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.4#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
</del><ins>+ sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.7#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>