[63036] trunk/dports

jmr at macports.org jmr at macports.org
Sun Jan 24 02:43:44 PST 2010


Revision: 63036
          http://trac.macports.org/changeset/63036
Author:   jmr at macports.org
Date:     2010-01-24 02:43:40 -0800 (Sun, 24 Jan 2010)
Log Message:
-----------
add python.link_binaries option to python26 portgroup, adapt ports accordingly

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/python26-1.0.tcl
    trunk/dports/net/py26-scapy/Portfile
    trunk/dports/python/py26-bpython/Portfile
    trunk/dports/python/py26-cheetah/Portfile
    trunk/dports/python/py26-chm2pdf/Portfile
    trunk/dports/python/py26-clonedigger/Portfile
    trunk/dports/python/py26-couchdb/Portfile
    trunk/dports/python/py26-cython/Portfile
    trunk/dports/python/py26-django/Portfile
    trunk/dports/python/py26-docutils/Portfile
    trunk/dports/python/py26-epydoc/Portfile
    trunk/dports/python/py26-fabric/Portfile
    trunk/dports/python/py26-freebase/Portfile
    trunk/dports/python/py26-gtk/Portfile
    trunk/dports/python/py26-hgsvn/Portfile
    trunk/dports/python/py26-imdb/Portfile
    trunk/dports/python/py26-impressive/Portfile
    trunk/dports/python/py26-ipython/Portfile
    trunk/dports/python/py26-kid/Portfile
    trunk/dports/python/py26-lint/Portfile
    trunk/dports/python/py26-logilab-common/Portfile
    trunk/dports/python/py26-macholib/Portfile
    trunk/dports/python/py26-mako/Portfile
    trunk/dports/python/py26-markdown/Portfile
    trunk/dports/python/py26-nose/Portfile
    trunk/dports/python/py26-numpy/Portfile
    trunk/dports/python/py26-pastescript/Portfile
    trunk/dports/python/py26-paver/Portfile
    trunk/dports/python/py26-pip/Portfile
    trunk/dports/python/py26-py/Portfile
    trunk/dports/python/py26-pycallgraph/Portfile
    trunk/dports/python/py26-pyflakes/Portfile
    trunk/dports/python/py26-rdflib/Portfile
    trunk/dports/python/py26-robotframework/Portfile
    trunk/dports/python/py26-robotframework-ride/Portfile
    trunk/dports/python/py26-scientific/Portfile
    trunk/dports/python/py26-setuptools/Portfile
    trunk/dports/python/py26-sphinx/Portfile
    trunk/dports/python/py26-sqlalchemy-migrate/Portfile
    trunk/dports/python/py26-sympy/Portfile
    trunk/dports/python/py26-twisted/Portfile
    trunk/dports/python/py26-virtualenv/Portfile
    trunk/dports/python/py26-virtualenvwrapper/Portfile
    trunk/dports/python/py26-xattr/Portfile

Modified: trunk/dports/_resources/port1.0/group/python26-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python26-1.0.tcl	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/_resources/port1.0/group/python26-1.0.tcl	2010-01-24 10:43:40 UTC (rev 63036)
@@ -57,3 +57,15 @@
 pre-destroot	{
 	xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/examples
 }
+
+options         python.link_binaries
+default python.link_binaries yes
+post-destroot {
+    if {${python.link_binaries}} {
+        foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] {
+            if {[catch {file type "${destroot}${prefix}/bin/${bin}-${python.branch}"}]} {
+                ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}-${python.branch}"
+            }
+        }
+    }
+}

Modified: trunk/dports/net/py26-scapy/Portfile
===================================================================
--- trunk/dports/net/py26-scapy/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/net/py26-scapy/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -38,10 +38,6 @@
                       path:bin/dot:graphviz
 
 post-destroot {
-        ln -s ${python.prefix}/bin/scapy \
-              ${destroot}${prefix}/bin/scapy-${python.branch}
-        ln -s ${python.prefix}/bin/UTscapy \
-              ${destroot}${prefix}/bin/UTscapy-${python.branch}
         ln -s ${python.prefix}/share/man/man1/scapy.1.gz \
               ${destroot}${prefix}/share/man/man1/scapy-${python.branch}.1.gz
 }

Modified: trunk/dports/python/py26-bpython/Portfile
===================================================================
--- trunk/dports/python/py26-bpython/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-bpython/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -26,7 +26,6 @@
                         port:py26-setuptools
 
 post-destroot {
-    ln -s ${python.prefix}/bin/bpython ${destroot}${prefix}/bin/bpython
     set sharedoc ${destroot}${prefix}/share/bpython2.6
     xinstall -d ${sharedoc}
     xinstall ${worksrcpath}/sample-config ${sharedoc}

Modified: trunk/dports/python/py26-cheetah/Portfile
===================================================================
--- trunk/dports/python/py26-cheetah/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-cheetah/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -27,9 +27,6 @@
 post-destroot {
 	xinstall -m 644 -W ${worksrcpath} CHANGES LICENSE TODO \
 		${destroot}${prefix}/share/doc/${name}
-	ln -s ${python.prefix}/bin/cheetah ${destroot}${prefix}/bin/cheetah-2.6
-	ln -s ${python.prefix}/bin/cheetah-compile \
-		${destroot}${prefix}/bin/cheetah-compile-2.6
 }
 
 livecheck.type	regex

Modified: trunk/dports/python/py26-chm2pdf/Portfile
===================================================================
--- trunk/dports/python/py26-chm2pdf/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-chm2pdf/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -23,7 +23,3 @@
 depends_run-append	port:chmlib \
                     port:py26-chm \
                     port:htmldoc
-                    
-post-destroot {
-  ln -s ${python.prefix}/bin/chm2pdf ${destroot}${prefix}/bin/chm2pdf
-}                    

Modified: trunk/dports/python/py26-clonedigger/Portfile
===================================================================
--- trunk/dports/python/py26-clonedigger/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-clonedigger/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -19,12 +19,6 @@
                     sha1 f5a3854d2f5f0f0b997459d1b0f529e216fecb55 \
                     rmd160 deaf039ca347181959fe54da1b88f6e932b15340
 
-post-destroot {
-    ln -s ${python.prefix}/bin/clonedigger \
-        ${destroot}${prefix}/bin/clonedigger-${python.branch}
-}
-
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/clonedigger
 livecheck.regex     "clonedigger-(.+?).tar.gz"
-

Modified: trunk/dports/python/py26-couchdb/Portfile
===================================================================
--- trunk/dports/python/py26-couchdb/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-couchdb/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -32,12 +32,6 @@
                     port:py26-httplib2 \
                     port:py26-setuptools
 
-post-destroot {
-    foreach f {couchdb-dump couchdb-load couchdb-replicate couchpy} {
-        ln -s ${python.prefix}/bin/${f} ${destroot}${prefix}/bin/${f}
-    }
-}
-
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/CouchDB
 livecheck.regex     {CouchDB ([0-9]+\.[0-9]+(?:\.[0-9]+)?)}

Modified: trunk/dports/python/py26-cython/Portfile
===================================================================
--- trunk/dports/python/py26-cython/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-cython/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -30,8 +30,6 @@
         special_methods.html ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} INSTALL.txt README.txt\
         ToDo.txt USAGE.txt ${destroot}${prefix}/share/doc/${name}
-    ln -s ${python.prefix}/bin/cython \
-        ${destroot}${prefix}/bin/cython-${python.branch}
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py26-django/Portfile
===================================================================
--- trunk/dports/python/py26-django/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-django/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -37,6 +37,8 @@
     }
 }
 
+# we want *-2.6.py not *.py-2.6
+python.link_binaries no
 post-destroot   {
     xinstall -m 644 -W ${worksrcpath} AUTHORS INSTALL LICENSE README \
         ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py26-docutils/Portfile
===================================================================
--- trunk/dports/python/py26-docutils/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-docutils/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -25,6 +25,8 @@
                     sha1    70ca2dd94969ddf76217e5fe907b0b23f16cc199 \
                     rmd160  3e8dfd2923528bbeac0ca33ccfe6f576c74f1886
 
+# we want *-2.6.py not *.py-2.6
+python.link_binaries no
 post-destroot {
     foreach f {rst2html rst2latex rst2newlatex rst2pseudoxml rst2s5 rst2xml rstpep2html} {
         ln -s ${python.prefix}/bin/${f}.py ${destroot}${prefix}/bin/${f}-2.6.py

Modified: trunk/dports/python/py26-epydoc/Portfile
===================================================================
--- trunk/dports/python/py26-epydoc/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-epydoc/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -29,10 +29,4 @@
 	file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} LICENSE.txt README.txt \
 		${destroot}${prefix}/share/doc/${name}
-	foreach binfile {apirst2html.py epydoc epydocgui} {
-		ui_msg "see ${binfile}"
-		ln -s ${python.prefix}/bin/${binfile} \
-			${destroot}${prefix}/bin/${binfile}-${python.branch}
-	}
 }
-

Modified: trunk/dports/python/py26-fabric/Portfile
===================================================================
--- trunk/dports/python/py26-fabric/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-fabric/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -32,11 +32,6 @@
 depends_lib-append  port:py26-setuptools \
                     port:py26-paramiko
 
-post-destroot {
-    ln -s ${python.prefix}/bin/fab \
-        ${destroot}${prefix}/bin/fab-${python.branch}
-}
-
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/Fabric
 livecheck.regex     Fabric (0\.\[0-9\]+\.\[0-9\]+)

Modified: trunk/dports/python/py26-freebase/Portfile
===================================================================
--- trunk/dports/python/py26-freebase/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-freebase/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -28,9 +28,6 @@
    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    xinstall -m 644 -W ${worksrcpath} README \
       ${destroot}${prefix}/share/doc/${name}
-   foreach binfile {fb_restore fb_save_base fb_save_type fcl} {
-      ln -s ${python.prefix}/bin/${binfile} ${destroot}${prefix}/bin/${binfile}-${python.branch}
-   }
 }
 
 livecheck.url       [lindex ${master_sites} 0]

Modified: trunk/dports/python/py26-gtk/Portfile
===================================================================
--- trunk/dports/python/py26-gtk/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-gtk/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -57,10 +57,6 @@
     xinstall -d ${destroot}${prefix}/share/gtk-doc/html
     system "ln -s ${python_prefix}/share/${my_name} ${destroot}${prefix}/share/${my_name}26"
     system "ln -s ${python_prefix}/share/gtk-doc/html/${my_name} ${destroot}${prefix}/share/gtk-doc/html/${my_name}26"
-
-    foreach bin [glob -directory ${destroot}${python_prefix}/bin -tails *] {
-        ln -s ${python_prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}-2.6
-    }
 }
 
 livecheck.type  regex

Modified: trunk/dports/python/py26-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py26-hgsvn/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-hgsvn/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -25,9 +25,6 @@
 post-destroot   {
         xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt  \
                 ${destroot}${prefix}/share/doc/${name}
-        foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-                ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}
-        }
 }
 
 livecheck.type		regex

Modified: trunk/dports/python/py26-imdb/Portfile
===================================================================
--- trunk/dports/python/py26-imdb/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-imdb/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -21,6 +21,7 @@
                     sha1    dc24344461c9a1bd38d3eddd34768d4dd468202e \
                     rmd160  6243c0ddb0084e3d31bf217c04d6382386d83b83
 
+python.link_binaries no
 post-destroot {
    eval move [glob ${destroot}${python.prefix}/doc/*] \
       ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py26-impressive/Portfile
===================================================================
--- trunk/dports/python/py26-impressive/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-impressive/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -38,6 +38,7 @@
 }
 build {}
 
+python.link_binaries no
 destroot {
     xinstall -d ${destroot}${prefix}/bin
     xinstall -d ${destroot}${prefix}/share/impressive

Modified: trunk/dports/python/py26-ipython/Portfile
===================================================================
--- trunk/dports/python/py26-ipython/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-ipython/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -29,9 +29,6 @@
 test.run                no
 
 post-destroot {
-    foreach f [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${f} ${destroot}${prefix}/bin/${f}${python.branch}
-    }
     foreach f {ipython pycolor} {
         ln -s ${python.prefix}/share/man/man1/${f}.1.gz ${destroot}${prefix}/share/man/man1/${f}${python.branch}.1.gz
     }

Modified: trunk/dports/python/py26-kid/Portfile
===================================================================
--- trunk/dports/python/py26-kid/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-kid/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -20,11 +20,6 @@
 depends_lib-append	port:py26-celementtree
 depends_build-append	port:py26-setuptools
 
-post-destroot {
-    ln -s ${python.prefix}/bin/kid ${destroot}${prefix}/bin/kid-2.6
-    ln -s ${python.prefix}/bin/kidc ${destroot}${prefix}/bin/kidc-2.6
-}
-
 test.run		yes
 
 livecheck.type  regex

Modified: trunk/dports/python/py26-lint/Portfile
===================================================================
--- trunk/dports/python/py26-lint/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-lint/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -40,8 +40,4 @@
     xinstall -m 644 -W ${worksrcpath} ChangeLog README TODO \
         ${destroot}${prefix}/share/doc/${name}
     file delete ${destroot}${python.pkgd}/logilab/__init__.py
-    foreach binfile {epylint pylint pylint-gui pyreverse symilar} {
-        ln -s ${python.prefix}/bin/${binfile} ${destroot}${prefix}/bin/${binfile}-${python.branch}
-    }
 }
-

Modified: trunk/dports/python/py26-logilab-common/Portfile
===================================================================
--- trunk/dports/python/py26-logilab-common/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-logilab-common/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -24,9 +24,6 @@
    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    xinstall -m 644 -W ${worksrcpath} ChangeLog README \
       ${destroot}${prefix}/share/doc/${name}
-
-   # alter the install name of pytest to include version name
-   ln -s ${python.prefix}/bin/pytest ${destroot}${prefix}/bin/pytest2.6
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py26-macholib/Portfile
===================================================================
--- trunk/dports/python/py26-macholib/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-macholib/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -31,12 +31,6 @@
                 sha1    bbe56f3b03ee5b431f34fb66cf22993587687ef8 \
                 rmd160  fa408bc5f1f3f58c0ff3ab43eb56f644bd6b83fa
 
-post-destroot {
-    foreach bin [glob -tails -directory "${destroot}${python.prefix}/bin" *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}-2.6
-    }
-}
-
 livecheck.type  regex
 livecheck.url   http://pypi.python.org/pypi/macholib/
 livecheck.regex {macholib ([0-9.]+)}

Modified: trunk/dports/python/py26-mako/Portfile
===================================================================
--- trunk/dports/python/py26-mako/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-mako/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -35,9 +35,3 @@
 checksums           md5     d8ca783630dc5e93970a2075532fa643 \
                     sha1    b3e4d48c30b5a2d273959e3921de428772f2acb4 \
                     rmd160  53341654526e5636d3eb3c5472bf53446d82dfad
-
-post-destroot {
-    foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${python.branch}
-    }
-}

Modified: trunk/dports/python/py26-markdown/Portfile
===================================================================
--- trunk/dports/python/py26-markdown/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-markdown/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -19,11 +19,6 @@
                     sha1    ce2848c60434a7c727c162ca5683998eb6d222c3 \
                     rmd160  fd3b0d634a8e066c48de8bab6141662e21d935a7
 
-post-destroot {
-    ln -s ${python.prefix}/bin/markdown \
-        ${destroot}${prefix}/bin/markdown-${python.branch}
-}
-
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/Markdown
 livecheck.regex     "Markdown (\[1-9\]+\.\[0-9\]+)"

Modified: trunk/dports/python/py26-nose/Portfile
===================================================================
--- trunk/dports/python/py26-nose/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-nose/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -39,13 +39,8 @@
 }
 
 post-destroot {
-    set branch 2.6
-    set framewpath ${frameworks_dir}/Python.framework
-    set framewdir  ${framewpath}/Versions/${branch}
+    ln -s ${python.prefix}/share/man/man1/nosetests.1 ${destroot}${prefix}/share/man/man1/nosetests${python.branch}.1
 
-    ln -s ${framewdir}/share/man/man1/nosetests.1 ${destroot}${prefix}/share/man/man1/nosetests${branch}.1
-    ln -s ${python.prefix}/bin/nosetests  ${destroot}${prefix}/bin/nosetests-${branch}
-
     xinstall -m 644 -W ${worksrcpath} \
         AUTHORS CHANGELOG NEWS README.txt \
 		${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py26-numpy/Portfile
===================================================================
--- trunk/dports/python/py26-numpy/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-numpy/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -50,11 +50,6 @@
     reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" ${worksrcpath}/numpy/f2py/setup.py
 }
 
-post-destroot {
-    set branch 2.6
-    ln -s ${python.prefix}/bin/f2py ${destroot}${prefix}/bin/f2py-${branch}
-}
-
 variant no_gcc43 description {Do not use the gcc43 compiler (disables fortran code)} {
     depends_lib-delete port:gcc43
     build.env-delete    CC="${prefix}/bin/gcc-mp-4.3" \

Modified: trunk/dports/python/py26-pastescript/Portfile
===================================================================
--- trunk/dports/python/py26-pastescript/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-pastescript/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -27,5 +27,4 @@
 	foreach f [glob -directory ${worksrcpath}/docs *] {
 		copy $f ${destroot}${prefix}/share/doc/${name}/[file tail $f]
 	}
-	ln -s ${python.prefix}/bin/paster ${destroot}${prefix}/bin/paster-2.6
 }

Modified: trunk/dports/python/py26-paver/Portfile
===================================================================
--- trunk/dports/python/py26-paver/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-paver/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -35,10 +35,6 @@
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} LICENSE.txt README.txt \
         ${destroot}${prefix}/share/doc/${name}
-    
-    # To avoid conflict between py/py25/py26-paver
-    ln -s ${python.prefix}/bin/paver \
-        ${destroot}${prefix}/bin/paver-${python.branch}
 }
 
 

Modified: trunk/dports/python/py26-pip/Portfile
===================================================================
--- trunk/dports/python/py26-pip/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-pip/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -28,7 +28,6 @@
     xinstall -m 644 -W ${worksrcpath}/docs index.txt news.txt \
         requirement-format.txt license.txt configuration.txt \
         ${destroot}${prefix}/share/doc/${name}
-    ln -s ${python.prefix}/bin/pip ${destroot}${prefix}/bin/pip-2.6
 }
 
 livecheck.type      regex

Modified: trunk/dports/python/py26-py/Portfile
===================================================================
--- trunk/dports/python/py26-py/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-py/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -19,9 +19,3 @@
                   sha1 36ca24b4424ce9ba47e3a8af0b29512eb156b116 \
                   rmd160 c48c67421545b2181eaff75e8d05cbcebf4ead1c
 distname          py-${version}
-
-post-destroot {
-    foreach f [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${f} ${destroot}${prefix}/bin/${f}${python.branch}
-    }
-}

Modified: trunk/dports/python/py26-pycallgraph/Portfile
===================================================================
--- trunk/dports/python/py26-pycallgraph/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-pycallgraph/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -26,8 +26,6 @@
                 rmd160  bb46a88afa374db4552e6311f897fa50245af314
 
 post-destroot {
-    ln -s ${frameworks_dir}/Python.framework/Versions/${python.branch}/bin/${my_name} \
-        ${destroot}${prefix}/bin/${my_name}-${python.branch}
     set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}/html
     xinstall -m 644 -W $worksrcpath COPYING ${destroot}${docdir}

Modified: trunk/dports/python/py26-pyflakes/Portfile
===================================================================
--- trunk/dports/python/py26-pyflakes/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-pyflakes/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -23,10 +23,6 @@
 
 depends_lib-append  port:py26-setuptools
 
-post-destroot {
-    ln -s ${python.prefix}/bin/pyflakes ${destroot}${prefix}/bin/pyflakes-2.6
-}
-
 livecheck.type      regex
 livecheck.url       http://pypi.python.org/pypi/pyflakes/
 livecheck.regex     pyflakes (0\.\[0-9\]+\.\[0-9\]+)

Modified: trunk/dports/python/py26-rdflib/Portfile
===================================================================
--- trunk/dports/python/py26-rdflib/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-rdflib/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -29,8 +29,6 @@
 test.target
 
 post-destroot {
-	ln -s ${python.prefix}/bin/rdfpipe \
-		${destroot}${prefix}/bin/rdfpipe-${python.branch}
 	xinstall -m 644 -W ${worksrcpath} CHANGELOG LICENSE \
 		README ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 ${worksrcpath}/examples/example.py \

Modified: trunk/dports/python/py26-robotframework/Portfile
===================================================================
--- trunk/dports/python/py26-robotframework/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-robotframework/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -26,17 +26,10 @@
                     sha1    5a73f2607c54f18714ced63db454b13591ccf19f \
                     rmd160  859dd7c3b97d43c099a13c13b268745828cdfaed
 
-set framewpath ${frameworks_dir}/Python.framework
-set framewdir  ${framewpath}/Versions/2.6
-
 post-destroot		{
-    reinplace "s;${destroot};;" ${destroot}/${framewdir}/bin/pybot
-    reinplace "s;${destroot};;" ${destroot}/${framewdir}/bin/jybot
-    reinplace "s;${destroot};;" ${destroot}/${framewdir}/bin/rebot
-
-    xinstall ${destroot}/${framewdir}/bin/pybot ${destroot}/${prefix}/bin/pybot
-    xinstall ${destroot}/${framewdir}/bin/pybot ${destroot}/${prefix}/bin/jybot
-    xinstall ${destroot}/${framewdir}/bin/pybot ${destroot}/${prefix}/bin/rebot
+    reinplace "s;${destroot};;" ${destroot}${python.prefix}/bin/pybot
+    reinplace "s;${destroot};;" ${destroot}${python.prefix}/bin/jybot
+    reinplace "s;${destroot};;" ${destroot}${python.prefix}/bin/rebot
 }
 
 livecheck.type     regex

Modified: trunk/dports/python/py26-robotframework-ride/Portfile
===================================================================
--- trunk/dports/python/py26-robotframework-ride/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-robotframework-ride/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -27,11 +27,9 @@
                     sha1    4e92e79aefda5bf87ff243b52f6cbf36305b4ec6 \
                     rmd160  4c143c825fb92d32333e17fac180545409773f33
 
-set framewpath ${frameworks_dir}/Python.framework
-set framewdir  ${framewpath}/Versions/2.6
-
+python.link_binaries no
 post-destroot {
-    xinstall ${destroot}/${framewdir}/bin/ride.py ${destroot}/${prefix}/bin/ride.py
+    ln -s ${python.prefix}/bin/ride.py ${destroot}${prefix}/bin/ride-${python.branch}.py
 }
 livecheck.type     regex
 livecheck.url      ${homepage}

Modified: trunk/dports/python/py26-scientific/Portfile
===================================================================
--- trunk/dports/python/py26-scientific/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-scientific/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -31,12 +31,6 @@
 	            -I${worksrcpath}/Include" \
                 NETCDF_PREFIX=${prefix}
 
-post-destroot {
-    foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${python.branch}
-    }
-}
-
 platform macosx {
     post-extract {
         copy -force ${filespath}/customize.py-macosx ${worksrcpath}/customize.py
@@ -59,7 +53,7 @@
     }
     post-destroot {
         xinstall ${worksrcpath}/Src/MPI/mpipython ${destroot}${python.prefix}/bin
-        ln -s ${python.prefix}/bin/mpipython ${destroot}${prefix}/bin/mpipython${python.branch}
+        ln -s ${python.prefix}/bin/mpipython ${destroot}${prefix}/bin/mpipython-${python.branch}
     }
 }
 

Modified: trunk/dports/python/py26-setuptools/Portfile
===================================================================
--- trunk/dports/python/py26-setuptools/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-setuptools/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -26,6 +26,7 @@
 					sha1    8d1ad6384d358c547c50c60f1bfdb3362c6c4a7d \
 					rmd160  7af8f39e5e74d96d10cc0d00b15a26462d66f42c
 
+python.link_binaries no
 post-destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} EasyInstall.txt api_tests.txt \

Modified: trunk/dports/python/py26-sphinx/Portfile
===================================================================
--- trunk/dports/python/py26-sphinx/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-sphinx/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -32,11 +32,5 @@
                     port:py26-jinja2 \
                     port:py26-setuptools
 
-post-destroot {
-    foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${python.branch}
-    }
-}
-
 livecheck.type      regex
 livecheck.regex     {<p>Current version: <b>([0-9.]+)</b></p>}

Modified: trunk/dports/python/py26-sqlalchemy-migrate/Portfile
===================================================================
--- trunk/dports/python/py26-sqlalchemy-migrate/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-sqlalchemy-migrate/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -24,9 +24,3 @@
                   rmd160 18b4f57ac3b3d01e49e7d01142d9f8156f221159
 depends_lib       port:py26-setuptools
 distname          sqlalchemy-migrate-${version}
-
-post-destroot {
-    foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${python.branch}
-    }
-}

Modified: trunk/dports/python/py26-sympy/Portfile
===================================================================
--- trunk/dports/python/py26-sympy/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-sympy/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -27,8 +27,6 @@
                     rmd160  663671a544d47ff25df407a6168affe7b7b89767
 
 post-destroot {
-    ln -s ${python.prefix}/bin/isympy \
-          ${destroot}${prefix}/bin/isympy${python.branch}
     ln -s ${python.prefix}/share/man/man1/isympy.1 \
           ${destroot}${prefix}/share/man/man1/isympy${python.branch}.1
 }

Modified: trunk/dports/python/py26-twisted/Portfile
===================================================================
--- trunk/dports/python/py26-twisted/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-twisted/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -27,14 +27,6 @@
 
 depends_lib-append  port:py26-zopeinterface
 
-post-destroot {
-    set branch 2.6
-    
-    foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}-${branch}
-	}
-}
-
 livecheck.type   regex
 livecheck.url    http://twistedmatrix.com/trac/wiki/Downloads
 livecheck.regex  "The current release is Twisted (\\d+(?:\\.\\d+)*)"

Modified: trunk/dports/python/py26-virtualenv/Portfile
===================================================================
--- trunk/dports/python/py26-virtualenv/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-virtualenv/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -25,9 +25,6 @@
     foreach f [glob -directory ${worksrcpath}/docs *] {
         copy $f ${destroot}${prefix}/share/doc/${name}/[file tail $f]
     }
-    foreach bin [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-        ln -s ${python.prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${python.branch}
-    }
 }
 
 depends_lib-append  port:py26-setuptools

Modified: trunk/dports/python/py26-virtualenvwrapper/Portfile
===================================================================
--- trunk/dports/python/py26-virtualenvwrapper/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-virtualenvwrapper/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -25,8 +25,3 @@
 
 depends_lib-append  port:py26-setuptools\
                     port:py26-virtualenv
-
-post-destroot	{
-	ln -s ${python.prefix}/bin/virtualenvwrapper_bashrc \
-	    ${destroot}${prefix}/bin/virtualenvwrapper_bashrc-${python.branch}
-}

Modified: trunk/dports/python/py26-xattr/Portfile
===================================================================
--- trunk/dports/python/py26-xattr/Portfile	2010-01-24 08:19:13 UTC (rev 63035)
+++ trunk/dports/python/py26-xattr/Portfile	2010-01-24 10:43:40 UTC (rev 63036)
@@ -23,14 +23,6 @@
 
 depends_lib-append  port:py26-setuptools
 
-post-destroot {
-   foreach binfile [glob -tails -directory ${destroot}${python.prefix}/bin *] {
-      ln -s ${python.prefix}/bin/${binfile} \
-         ${destroot}${prefix}/bin/${binfile}
-   }
-}
-
 livecheck.type      regex
 livecheck.url       http://svn.red-bean.com/bob/xattr/releases/
 livecheck.regex     xattr-(\[0-9.\]+)
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100124/e27269a8/attachment-0001.html>


More information about the macports-changes mailing list