[96743] trunk/dports/python
Bradley Giesbrecht
pixilla at macports.org
Sun Aug 19 15:43:33 PDT 2012
Has "python.move_binaries" been added to the "python 1.0" PortGroup?
If so, have the changes been committed?
portindex | grep move_binaries
Failed to parse file python/py-distribute/Portfile: invalid command name "python.move_binaries"
Warning: failed to open old entry for python/py-django, making a new one
Failed to parse file python/py-django/Portfile with subport 'py25-django': invalid command name "python.move_binaries"
Failed to parse file python/py-django/Portfile with subport 'py26-django': invalid command name "python.move_binaries"
Failed to parse file python/py-django/Portfile with subport 'py27-django': invalid command name "python.move_binaries"
Warning: failed to open old entry for python/py-docutils, making a new one
Failed to parse file python/py-docutils/Portfile with subport 'py24-docutils': invalid command name "python.move_binaries"
...
svn info _resources/port1.0/group/python-1.0.tcl | grep Revision
Revision: 96603
Regards,
Bradley Giesbrecht (pixilla)
On Aug 17, 2012, at 5:57 PM, blair at macports.org wrote:
> Revision
> 96743
> Author
> blair at macports.org
> Date
> 2012-08-17 17:57:34 -0700 (Fri, 17 Aug 2012)
> Log Message
>
> py-* using python-1.0.tcl: follow up to r96718
> : do not rename binaries.
>
> ython-1.0.tcl: in
> r96718
> renames ${prefix}/bin/* for Python 2.{4,5} so
> there's no need for ports to do it. For ports that don't want the
> binaries renamed, set 'python.move_binaries' to 'no'.
>
> Modified Paths
>
> • trunk/dports/python/py-bdist_mpkg/Portfile
> • trunk/dports/python/py-bpython/Portfile
> • trunk/dports/python/py-cherrypy3/Portfile
> • trunk/dports/python/py-cython/Portfile
> • trunk/dports/python/py-distribute/Portfile
> • trunk/dports/python/py-django/Portfile
> • trunk/dports/python/py-docutils/Portfile
> • trunk/dports/python/py-hgsvn/Portfile
> • trunk/dports/python/py-ipython/Portfile
> • trunk/dports/python/py-modulegraph/Portfile
> • trunk/dports/python/py-nose/Portfile
> • trunk/dports/python/py-pip/Portfile
> • trunk/dports/python/py-pygments/Portfile
> • trunk/dports/python/py-scientific/Portfile
> • trunk/dports/python/py-sip/Portfile
> • trunk/dports/python/py-snmp/Portfile
> • trunk/dports/python/py-sphinx/Portfile
> • trunk/dports/python/py-sympy/Portfile
> • trunk/dports/python/py-twisted/Portfile
> • trunk/dports/python/py-vobject/Portfile
> • trunk/dports/python/py-zc-buildout/Portfile
> Diff
>
> Modified: trunk/dports/python/py-bdist_mpkg/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-bdist_mpkg/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-bdist_mpkg/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -32,12 +32,6 @@
>
>
>
> if {$subport != $name} {
>
> depends_lib port:py${python.version}-distribute
>
> - if {${python.version} == "24" || ${python.version} == "25"} {
> - post-destroot {
> - move ${destroot}${prefix}/bin/bdist_mpkg \
> - ${destroot}${prefix}/bin/bdist_mpkg-${python.branch}
> - }
> - }
>
> livecheck.type none
>
> } else {
>
> livecheck.type regex
>
> Modified: trunk/dports/python/py-bpython/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-bpython/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-bpython/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -23,19 +23,6 @@
>
> python.versions 25 26 27 31 32
>
> python.default_version 27
>
>
>
> -subport py25-bpython {
> - python.link_binaries no
> - python.link_binaries_suffix "-2.5"
> - post-destroot {
> - foreach bin [glob -nocomplain -tails -directory "${destroot}${prefix}/bin" *] {
> - if {[catch {file type "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"}]} {
> - move "${destroot}${prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"
> - }
> - }
> - }
> -}
> -
> -
>
> if {$name != $subport} {
>
> depends_lib-append port:py${python.version}-parsing \
>
> port:py${python.version}-pygments \
>
> Modified: trunk/dports/python/py-cherrypy3/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-cherrypy3/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-cherrypy3/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -30,11 +30,6 @@
>
>
>
> if {$subport != $name} {
>
> conflicts py${python.version}-cherrypy
>
> - if {${python.version} <= 25} {
> - post-destroot {
> - move ${destroot}${prefix}/bin/cherryd ${destroot}${prefix}/bin/cherryd-${python.branch}
> - }
> - }
>
> livecheck.type none
>
> } else {
>
> livecheck.type regex
>
> Modified: trunk/dports/python/py-cython/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-cython/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-cython/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -41,8 +41,6 @@
>
> special_methods.html ${destroot}${prefix}/share/doc/${subport}
>
> xinstall -m 644 -W ${worksrcpath} INSTALL.txt README.txt \
>
> ToDo.txt USAGE.txt ${destroot}${prefix}/share/doc/${subport}
>
> - move ${destroot}${prefix}/bin/cython \
> - ${destroot}${prefix}/bin/cython-${python.branch}
>
> } else {
>
> xinstall -m 755 -d ${destroot}${python.prefix}/share/doc/cython
>
> xinstall -m 644 -W ${worksrcpath}/Doc About.html FAQ.html \
>
> Modified: trunk/dports/python/py-distribute/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-distribute/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-distribute/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -28,6 +28,7 @@
>
> python.versions 24 25 26 27 31 32
>
> python.default_version 27
>
> python.link_binaries no
>
> +python.move_binaries no
>
>
>
> if {$subport != $name} {
>
> post-destroot {
>
> Modified: trunk/dports/python/py-django/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-django/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-django/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -46,6 +46,7 @@
>
>
>
> # we want *-${python.branch}.py not *.py-${python.branch}
>
> python.link_binaries no
>
> + python.move_binaries no
>
> post-destroot {
>
> xinstall -m 644 -W ${worksrcpath} AUTHORS INSTALL LICENSE README \
>
> ${destroot}${prefix}/share/doc/${subport}
>
> Modified: trunk/dports/python/py-docutils/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-docutils/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-docutils/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -33,6 +33,7 @@
>
>
>
> # we want e.g. *-2.7.py not *.py-2.7
>
> python.link_binaries no
>
> + python.move_binaries no
>
> post-destroot {
>
> foreach f {rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xml rstpep2html rst2xetex} {
>
> if {${python.version} >= 26} {
>
> Modified: trunk/dports/python/py-hgsvn/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-hgsvn/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-hgsvn/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -37,11 +37,6 @@
>
> post-destroot {
>
> xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt \
>
> ${destroot}${prefix}/share/doc/py${python.version}-hgsvn
>
> - if {${python.version} == 25 || ${python.version} == 24} {
> - move ${destroot}${prefix}/bin/hgimportsvn ${destroot}${prefix}/bin/hgimportsvn-${python.version}
> - move ${destroot}${prefix}/bin/hgpullsvn ${destroot}${prefix}/bin/hgpullsvn-${python.version}
> - move ${destroot}${prefix}/bin/hgpushsvn ${destroot}${prefix}/bin/hgpushsvn-${python.version}
> - }
>
> }
>
>
>
> livecheck.type none
>
> Modified: trunk/dports/python/py-ipython/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-ipython/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-ipython/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -81,18 +81,12 @@
>
>
>
> post-destroot {
>
> if {$subport == "py24-${realname}"} {
>
> - foreach f {ipcluster ipcontroller ipengine iptest ipython ipython-wx ipythonx irunner pycolor} {
> - move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}-${python.branch}
> - }
>
> foreach f {ipython pycolor} {
>
> move ${destroot}${prefix}/share/man/man1/${f}.1.gz \
>
> ${destroot}${prefix}/share/man/man1/${f}-${python.branch}.1.gz
>
> }
>
> move ${destroot}${prefix}/share/doc/${realname} ${destroot}${prefix}/share/doc/${name}
>
> } elseif {$subport == "py25-${realname}"} {
>
> - foreach f {ipcluster ipcontroller ipengine iptest ipython ipython-wx ipythonx irunner pycolor} {
> - move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}-${python.branch}
> - }
>
> foreach f {ipcluster ipcontroller ipengine ipython ipython-wx ipythonx irunner pycolor} {
>
> move ${destroot}${prefix}/share/man/man1/${f}.1.gz \
>
> ${destroot}${prefix}/share/man/man1/${f}-${python.branch}.1.gz
>
> Modified: trunk/dports/python/py-modulegraph/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-modulegraph/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-modulegraph/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -32,12 +32,6 @@
>
>
>
> if {$subport != $name} {
>
> depends_lib port:py${python.version}-altgraph
>
> - if {${python.version} == 24 || ${python.version} == 25} {
> - post-destroot {
> - move ${destroot}${prefix}/bin/modulegraph \
> - ${destroot}${prefix}/bin/modulegraph-${python.branch}
> - }
> - }
>
> livecheck.type none
>
> } else {
>
> livecheck.type regex
>
> Modified: trunk/dports/python/py-nose/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-nose/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-nose/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -36,6 +36,7 @@
>
>
>
> # already installs version-suffixed executables
>
> python.link_binaries no
>
> +python.move_binaries no
>
>
>
> depends_run-append port:nosetests_select
>
> if {$subport != $name} {
>
> Modified: trunk/dports/python/py-pip/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-pip/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-pip/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -29,6 +29,7 @@
>
> depends_lib port:py${python.version}-distribute
>
>
>
> python.link_binaries_suffix
>
> + python.move_binaries no
>
> post-destroot {
>
> xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
>
> xinstall -m 644 -W ${worksrcpath}/docs index.txt news.txt \
>
> Modified: trunk/dports/python/py-pygments/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-pygments/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-pygments/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -33,11 +33,6 @@
>
> depends_lib port:py${python.version}-distribute
>
>
>
> post-destroot {
>
> - if {${python.version} < 26} {
> - move ${destroot}${prefix}/bin/pygmentize \
> - ${destroot}${prefix}/bin/pygmentize-${python.branch}
> - }
> -
>
> set docdir ${prefix}/share/doc/${subport}
>
> xinstall -d ${destroot}${docdir}
>
> xinstall -m 644 -W ${worksrcpath} AUTHORS CHANGES LICENSE TODO \
>
> Modified: trunk/dports/python/py-scientific/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-scientific/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-scientific/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -73,7 +73,6 @@
>
> }
>
> post-destroot {
>
> xinstall ${worksrcpath}/Src/MPI/mpipython ${destroot}${python.prefix}/bin
>
> - ln -s ${python.prefix}/bin/mpipython ${destroot}${prefix}/bin/mpipython-${python.branch}
>
> }
>
> }
>
> }
>
> Modified: trunk/dports/python/py-sip/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-sip/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-sip/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -106,7 +106,6 @@
>
> file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${subport}
>
> xinstall -m 644 -W ${worksrcpath} LICENSE LICENSE-GPL2 LICENSE-GPL3 NEWS README \
>
> ${destroot}${prefix}/share/doc/${subport}
>
> - move ${destroot}${prefix}/bin/sip ${destroot}${prefix}/bin/sip-${python.branch}
>
> system "${python.bin} ${python.libdir}/compileall.py ${destroot}${prefix}"
>
> system "${python.bin} -O ${python.libdir}/compileall.py ${destroot}${prefix}"
>
> }
>
> Modified: trunk/dports/python/py-snmp/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-snmp/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-snmp/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -32,9 +32,5 @@
>
> file delete -force ${destroot}${prefix}/share/doc/${subport}
>
> file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${subport}
>
> file copy ${worksrcpath}/examples ${destroot}${prefix}/share/doc/${subport}
>
> - if {${python.version} <= 25} {
> - move ${destroot}${prefix}/bin/build-pysnmp-mib ${destroot}${prefix}/bin/build-pysnmp-mib-${python.branch}
> - move ${destroot}${prefix}/bin/libsmi2pysnmp ${destroot}${prefix}/bin/libsmi2pysnmp-${python.branch}
> - }
>
> }
>
> }
>
> Modified: trunk/dports/python/py-sphinx/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-sphinx/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-sphinx/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -40,14 +40,6 @@
>
> port:py${python.version}-jinja2 \
>
> port:sphinx_select
>
>
>
> - if {${python.version} <= 25} {
> - post-destroot {
> - foreach f [glob -directory "${destroot}${prefix}/bin" *] {
> - move ${f} ${f}-${python.branch}
> - }
> - }
> - }
> -
>
> select.group sphinx
>
> select.file ${filespath}/py${python.version}-sphinx
>
>
>
> Modified: trunk/dports/python/py-sympy/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-sympy/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-sympy/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -39,8 +39,6 @@
>
> post-destroot {
>
> set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
>
> if {$subport == "py25-sympy"} {
>
> - move ${destroot}${prefix}/bin/isympy \
> - ${destroot}${prefix}/bin/isympy-${python.branch}
>
> move ${destroot}${prefix}/share/man/man1/isympy.1 \
>
> ${destroot}${prefix}/share/man/man1/isympy-${python.branch}.1
>
> system "$gzip -9vf ${destroot}${prefix}/share/man/man1/isympy-${python.branch}.1"
>
> Modified: trunk/dports/python/py-twisted/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-twisted/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-twisted/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -33,11 +33,6 @@
>
> if {$subport != $name} {
>
> depends_lib-append port:py${python.version}-zopeinterface
>
> post-destroot {
>
> - if {${python.version} <= 25} {
> - foreach f [glob -tails -directory ${destroot}${prefix}/bin *] {
> - move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}-${python.branch}
> - }
> - }
>
> # update the plugin cache
>
> system "PYTHONPATH=${destroot}${python.pkgd} ${python.bin} ${filespath}/getPlugins.py"
>
> }
>
> Modified: trunk/dports/python/py-vobject/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-vobject/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-vobject/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -46,14 +46,5 @@
>
> PKG-INFO \
>
> README.txt \
>
> ${destroot}${docdir}
>
> -
> - # This is only required for Python versions 2.4 and 2.5 as newer
> - # versions automatically create the "-2.x" variants...
> - if {${python.version} in [split "24 25"]} {
> - move ${destroot}${prefix}/bin/change_tz \
> - ${destroot}${prefix}/bin/change_tz-${python.branch}
> - move ${destroot}${prefix}/bin/ics_diff \
> - ${destroot}${prefix}/bin/ics_diff-${python.branch}
> - }
>
> }
>
> }
>
> Modified: trunk/dports/python/py-zc-buildout/Portfile (96742 => 96743)
>
> --- trunk/dports/python/py-zc-buildout/Portfile 2012-08-18 00:52:25 UTC (rev 96742)
> +++ trunk/dports/python/py-zc-buildout/Portfile 2012-08-18 00:57:34 UTC (rev 96743)
>
> @@ -52,9 +52,3 @@
>
> system "chmod -R 755 ${destroot}${python.pkgd}"
>
> }
>
> }
>
> -
> -subport py25-zc-buildout {
> - post-destroot {
> - move ${destroot}${prefix}/bin/buildout ${destroot}${prefix}/bin/buildout-2.5
> - }
> -}
>
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> http://lists.macosforge.org/mailman/listinfo/macports-changes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2763 bytes
Desc: not available
URL: <http://lists.macosforge.org/pipermail/macports-dev/attachments/20120819/cbfe4ace/attachment-0001.p7s>
More information about the macports-dev
mailing list