[94114] trunk/dports/lang/pypy

[jmr at macports.org]

Revision: 94114
          https://trac.macports.org/changeset/94114
Author:   jmr at macports.org
Date:     2012-06-09 07:21:49 -0700 (Sat, 09 Jun 2012)
Log Message:
-----------
pypy: update to 1.9

Modified Paths:
--------------
    trunk/dports/lang/pypy/Portfile
    trunk/dports/lang/pypy/files/darwin.py.diff
    trunk/dports/lang/pypy/files/make_output.diff

Modified: trunk/dports/lang/pypy/Portfile
===================================================================
--- trunk/dports/lang/pypy/Portfile	2012-06-09 13:26:43 UTC (rev 94113)
+++ trunk/dports/lang/pypy/Portfile	2012-06-09 14:21:49 UTC (rev 94114)
@@ -4,9 +4,8 @@
 PortSystem          1.0
 
 name                pypy
-version             1.8
-revision            1
-set changeset       2346207d9946
+version             1.9
+set changeset       341e1e3821ff
 categories          lang python devel
 license             MIT PSF
 maintainers         jmr openmaintainer
@@ -19,15 +18,14 @@
 platforms           darwin
 
 homepage            http://pypy.org/
-# bitbucket tarballs are apparently regenerated sometimes without the contents changing
-#master_sites
 master_sites        https://bitbucket.org/pypy/pypy/get/
 use_bzip2           yes
 distname            release-${version}
 worksrcdir          ${name}-${name}-${changeset}
 
-checksums           rmd160 70fe569b466357ee64685c8ce15278d24862c711 \
-                    sha256 ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287
+checksums           md5 f92c0171a9578a3e4a0f74947ec596ab \
+                    sha1 36a05432bbcee5d92a320fa27a627aeb281086b4 \
+                    rmd160 8ac2f53330ae450650f05753985bdbb42e07b526
 
 depends_build       port:pkgconfig
 depends_lib         port:libffi \
@@ -39,12 +37,11 @@
 use_configure       no
 
 # use pypy to build if it's already installed
-# XXX 1.7 crashes building 1.8
-#if {[file executable ${prefix}/lib/pypy/pypy-c]} {
-#    build.cmd       ${prefix}/lib/pypy/pypy-c
-#} else {
+if {[file executable ${prefix}/lib/pypy/pypy-c]} {
+    build.cmd       ${prefix}/lib/pypy/pypy-c
+} else {
     build.cmd       ${prefix}/bin/python2.7
-#}
+}
 
 # a lot of memory is used before the C compiler even runs, so limit build.jobs
 # according to available memory more tightly than the default
@@ -88,9 +85,9 @@
 
 destroot {
     xinstall -d ${destroot}${prefix}/lib/${name}/lib-python
-    copy ${worksrcpath}/lib-python/2.7 ${worksrcpath}/lib-python/modified-2.7 \
-         ${destroot}${prefix}/lib/${name}/lib-python
-    copy ${worksrcpath}/lib_pypy ${destroot}${prefix}/lib/${name}
+    copy ${worksrcpath}/lib-python/2.7 ${destroot}${prefix}/lib/${name}/lib-python
+    copy ${worksrcpath}/lib_pypy ${worksrcpath}/include \
+         ${destroot}${prefix}/lib/${name}
     # library search paths changed quite inconveniently such that the binary
     # won't run if it's in ${prefix}/bin
     xinstall -m 755 ${build.dir}/pypy-c ${destroot}${prefix}/lib/${name}

Modified: trunk/dports/lang/pypy/files/darwin.py.diff
===================================================================
--- trunk/dports/lang/pypy/files/darwin.py.diff	2012-06-09 13:26:43 UTC (rev 94113)
+++ trunk/dports/lang/pypy/files/darwin.py.diff	2012-06-09 14:21:49 UTC (rev 94114)
@@ -1,6 +1,6 @@
 --- pypy/translator/platform/darwin.py.orig	2011-05-01 00:18:50.000000000 +1000
 +++ pypy/translator/platform/darwin.py	2011-05-02 06:53:52.000000000 +1000
-@@ -30,10 +30,12 @@
+@@ -23,10 +23,12 @@
                  + args)
      
      def _include_dirs_for_libffi(self):

Modified: trunk/dports/lang/pypy/files/make_output.diff
===================================================================
--- trunk/dports/lang/pypy/files/make_output.diff	2012-06-09 13:26:43 UTC (rev 94113)
+++ trunk/dports/lang/pypy/files/make_output.diff	2012-06-09 14:21:49 UTC (rev 94114)
@@ -3,12 +3,12 @@
 @@ -1,6 +1,6 @@
  """Base support for POSIX-like platforms."""
  
--import py, os
-+import py, os, subprocess
+-import py, os, sys
++import py, os, sys, subprocess
  
  from pypy.tool import autopath
  from pypy.translator.platform import Platform, log, _run_subprocess
-@@ -183,9 +183,9 @@
+@@ -187,9 +187,9 @@
          else:
              path = path_to_makefile
          log.execute('make %s in %s' % (" ".join(extra_opts), path))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120609/a43d5fc3/attachment.html>