[78296] trunk/dports/lang/pypy

[jmr at macports.org]

Revision: 78296
          http://trac.macports.org/changeset/78296
Author:   jmr at macports.org
Date:     2011-05-01 15:31:49 -0700 (Sun, 01 May 2011)
Log Message:
-----------
pypy: update to 1.5

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

Modified: trunk/dports/lang/pypy/Portfile
===================================================================
--- trunk/dports/lang/pypy/Portfile	2011-05-01 21:21:05 UTC (rev 78295)
+++ trunk/dports/lang/pypy/Portfile	2011-05-01 22:31:49 UTC (rev 78296)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                pypy
-version             1.4.1
+version             1.5
 categories          lang python devel
 license             MIT PSF
 maintainers         jmr openmaintainer
@@ -21,13 +21,13 @@
 use_bzip2           yes
 distname            ${name}-${version}-src
 
-checksums           md5 ebbbb156b1eb842e9e65d909ed5f9f6d \
-                    sha1 922a8815377fe2e0c015338fa8b28ae16bf8c840 \
-                    rmd160 9f54887650fc8411c6f779cb56c0ee8cfa78efa1
+checksums           md5 cb9ada2c50666318c3a2863da1fbe487 \
+                    sha1 0ebcecaa4c725bf1a48272033d9f429b8a82b7e1 \
+                    rmd160 9c7d479ac5cd51c3789f3db99674b4c2936d88e0
 
 depends_build       port:pkgconfig
 depends_lib         port:libffi \
-                    port:python26
+                    port:python27
 
 patchfiles          darwin.py.diff
 post-patch {
@@ -53,7 +53,7 @@
 if {[file executable ${prefix}/lib/pypy/pypy-c]} {
     build.cmd       ${prefix}/lib/pypy/pypy-c
 } else {
-    build.cmd       ${prefix}/bin/python2.6
+    build.cmd       ${prefix}/bin/python2.7
 }
 build.args          --batch --cc=${configure.cc} --opt=jit \
                     --make-jobs=${build.jobs} \
@@ -76,7 +76,7 @@
 
 destroot {
     xinstall -d ${destroot}${prefix}/lib/${name}/lib-python
-    copy ${worksrcpath}/lib-python/2.5.2 ${worksrcpath}/lib-python/modified-2.5.2 \
+    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}
     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	2011-05-01 21:21:05 UTC (rev 78295)
+++ trunk/dports/lang/pypy/files/darwin.py.diff	2011-05-01 22:31:49 UTC (rev 78296)
@@ -1,43 +1,21 @@
---- pypy/translator/platform/darwin.py.orig	2010-11-27 01:38:08.000000000 +1100
-+++ pypy/translator/platform/darwin.py	2010-11-30 07:25:07.000000000 +1100
-@@ -5,8 +5,8 @@
- class Darwin(posix.BasePosix):
-     name = "darwin"
- 
--    link_flags = ('-mmacosx-version-min=10.4',)
--    cflags = ('-O3', '-fomit-frame-pointer', '-mmacosx-version-min=10.4')
-+    link_flags = ('-mmacosx-version-min=__MDT__',)
-+    cflags = ('-O3', '-fomit-frame-pointer', '-mmacosx-version-min=__MDT__')
-     standalone_only = ('-mdynamic-no-pic',)
-     shared_only = ()
- 
-@@ -31,21 +31,19 @@
+--- 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 @@
+                 + args)
      
-     def _preprocess_include_dirs(self, include_dirs):
-         res_incl_dirs = list(include_dirs)
--        res_incl_dirs.append('/usr/local/include') # Homebrew
--        res_incl_dirs.append('/opt/local/include') # MacPorts
-         return res_incl_dirs
- 
-     def _preprocess_library_dirs(self, library_dirs):
-         res_lib_dirs = list(library_dirs) 
--        res_lib_dirs.append('/usr/local/lib') # Homebrew
--        res_lib_dirs.append('/opt/local/lib') # MacPorts
-         return res_lib_dirs
- 
-     def include_dirs_for_libffi(self):
+     def _include_dirs_for_libffi(self):
 -        return ['/usr/include/ffi']
 +        return self._pkg_config("libffi", "--cflags-only-I",
 +                                ['/usr/include/ffi'])
  
-     def library_dirs_for_libffi(self):
+     def _library_dirs_for_libffi(self):
 -        return ['/usr/lib']
 +        return self._pkg_config("libffi", "--libs-only-L",
 +                                ['/usr/lib'])
  
      def check___thread(self):
          # currently __thread is not supported by Darwin gccs
-@@ -80,12 +78,12 @@
+@@ -68,12 +70,12 @@
  
  class Darwin_i386(Darwin):
      name = "darwin_i386"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110501/7fa25201/attachment-0001.html>