svn commit: r336049 - in head/lang/pypy-devel: . files

[David Naylor]

Author: dbn
Date: Tue Dec 10 07:36:09 2013
New Revision: 336049
URL: http://svnweb.freebsd.org/changeset/ports/336049

Log:
  Update lang/pypy-devel to 2.2.1.
  
   - Update the memory requirements, decreasing from previous version.

Modified:
  head/lang/pypy-devel/Makefile
  head/lang/pypy-devel/distinfo
  head/lang/pypy-devel/files/Makefile

Modified: head/lang/pypy-devel/Makefile
==============================================================================
--- head/lang/pypy-devel/Makefile	Tue Dec 10 06:33:45 2013	(r336048)
+++ head/lang/pypy-devel/Makefile	Tue Dec 10 07:36:09 2013	(r336049)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pypy
-DISTVERSION=	2.2
+DISTVERSION=	2.2.1
 CATEGORIES=	lang python
 MASTER_SITES=	http://cdn.bitbucket.org/pypy/pypy/downloads/ https://bitbucket.org/pypy/pypy/downloads/
 PKGNAMESUFFIX=	-devel
@@ -147,26 +147,26 @@ PYPY_${inst}_OPT=	2
 #
 .if ${PYPY_ARCH:M*64}
 .  if ${PORT_OPTIONS:MPYPY}
-# 64bit + pypy = 5.9 GiB
-PYPY_TRANSLATION_MEMORY=	6062436
+# 64bit + pypy = 5.5 GiB
+PYPY_TRANSLATION_MEMORY=	5803684
 .  elif ${PORT_OPTIONS:MPYPY_MINMEM}
-# 64bit + pypy (minimum memory) = 3.6GiB
-PYPY_TRANSLATION_MEMORY=	3729228
+# 64bit + pypy (minimum memory) = 3.3 GiB
+PYPY_TRANSLATION_MEMORY=	3452308
 .  else
-# 64bit + python = 4.7 GiB
-PYPY_TRANSLATION_MEMORY=	4662460
+# 64bit + python = 4.5 GiB
+PYPY_TRANSLATION_MEMORY=	4716500
 .  endif
 # 64bit system += 366 MiB
 PYPY_MINIMUM_MEMORY=	$$((${PYPY_TRANSLATION_MEMORY} + 374784))
 .else
 .  if ${PORT_OPTIONS:MPYPY}
 # 32bit + pypy = 2.3GiB
-PYPY_TRANSLATION_MEMORY=	2523868
+PYPY_TRANSLATION_MEMORY=	2438856
 .  elif ${PORT_OPTIONS:MPYPY_MINMEM}
-# 32bit + pypy (minimum memory) = 2.2GiB
-PYPY_TRANSLATION_MEMORY=	2246768
-# 32bit + python = 2.3 GiB
-PYPY_TRANSLATION_MEMORY=	2523868
+# 32bit + pypy (minimum memory) = 2.0GiB
+PYPY_TRANSLATION_MEMORY=	2120844
+# 32bit + python = 2.2 GiB
+PYPY_TRANSLATION_MEMORY=	2286764
 .  endif
 # 32bit system += 168 MiB
 PYPY_MINIMUM_MEMORY=	$$((${PYPY_TRANSLATION_MEMORY} + 171787))

Modified: head/lang/pypy-devel/distinfo
==============================================================================
--- head/lang/pypy-devel/distinfo	Tue Dec 10 06:33:45 2013	(r336048)
+++ head/lang/pypy-devel/distinfo	Tue Dec 10 07:36:09 2013	(r336049)
@@ -1,2 +1,2 @@
-SHA256 (pypy-2.2-src.tar.bz2) = 50fffcb86039e019530a63d656580bc53c173e5f19768bddd8699cd08448e04e
-SIZE (pypy-2.2-src.tar.bz2) = 14276850
+SHA256 (pypy-2.2.1-src.tar.bz2) = 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f
+SIZE (pypy-2.2.1-src.tar.bz2) = 14439822

Modified: head/lang/pypy-devel/files/Makefile
==============================================================================
--- head/lang/pypy-devel/files/Makefile	Tue Dec 10 06:33:45 2013	(r336048)
+++ head/lang/pypy-devel/files/Makefile	Tue Dec 10 07:36:09 2013	(r336049)
@@ -21,7 +21,7 @@ TOUCH?=		touch
 
 REINPLACE_CMD?=	${SED} -i~
 
-BUILDDIR=	usession-release-${DISTVERSION}.x-0
+BUILDDIR=	usession-release-${DISTVERSION:C/.[0-9]*$//}.x-0
 
 .for inst in ${PYPY_INST}