Index: lang/pypy/bsd.pypy.mk
===================================================================
--- lang/pypy/bsd.pypy.mk
+++ lang/pypy/bsd.pypy.mk
@@ -12,9 +12,9 @@
 PLIST_SUB+=	PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER}
 
 .if ${PYTHON_IMPL} == pypy
-DISTVERSION=	5.10.0
+DISTVERSION=	6.0.0
 PYPY_CFFI_VER=	${PYTHON_IMPL}-41
 .else # ${PYTHON_IMPL} == pypy3
-DISTVERSION=	5.10.1
+DISTVERSION=	6.0.0
 PYPY_CFFI_VER=	${PYTHON_IMPL}-${DISTVERSION:S|.||:C|\..*||}-${OPSYS:tl}${OSREL:C|\..*||}
 .endif
Index: lang/pypy/distinfo
===================================================================
--- lang/pypy/distinfo
+++ lang/pypy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514290464
-SHA256 (pypy2-v5.10.0-src.tar.bz2) = 1209f2db718e6afda17528baa5138177a14a0938588a7d3e1b7c722c483079a8
-SIZE (pypy2-v5.10.0-src.tar.bz2) = 19181430
+TIMESTAMP = 1530693507
+SHA256 (pypy2-v6.0.0-src.tar.bz2) = 6097ec5ee23d0d34d8cd27a1072bed041c8a080ad48731190a03a2223029212d
+SIZE (pypy2-v6.0.0-src.tar.bz2) = 19741694
Index: lang/pypy/files/patch-pypy_config_pypyoption.py
===================================================================
--- /dev/null
+++ lang/pypy/files/patch-pypy_config_pypyoption.py
@@ -0,0 +1,11 @@
+--- pypy/config/pypyoption.py.orig	2018-07-04 08:38:58 UTC
++++ pypy/config/pypyoption.py
+@@ -42,7 +42,7 @@ working_modules.update([
+ from rpython.jit.backend import detect_cpu
+ try:
+     if detect_cpu.autodetect().startswith('x86'):
+-        if not sys.platform.startswith('openbsd'):
++        if not (sys.platform.startswith('openbsd') or sys.platform.startswith('freebsd')):
+             working_modules.add('_vmprof')
+             working_modules.add('faulthandler')
+ except detect_cpu.ProcessorAutodetectError:
Index: lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py
===================================================================
--- lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpython/rlib/rvmprof/cintf.py.orig	2017-12-27 19:18:35 UTC
-+++ rpython/rlib/rvmprof/cintf.py
-@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio
- 
- # vmprof works only on x86 for now
- IS_SUPPORTED = detect_cpu.autodetect().startswith('x86')
--if sys.platform == 'win32':
-+if sys.platform in ('freebsd10', 'win32'):
-     IS_SUPPORTED = False
- 
- ROOT = py.path.local(rpythonroot).join('rpython', 'rlib', 'rvmprof')
Index: lang/pypy/pkg-descr
===================================================================
--- lang/pypy/pkg-descr
+++ lang/pypy/pkg-descr
@@ -1,5 +1,5 @@
 PyPy is a fast, compliant alternative implementation of the Python language
-(2.7.10). It has several advantages and distinct features:
+(2.7.13). It has several advantages and distinct features:
 
  - Speed: thanks to its Just-in-Time compiler, Python programs often run faster
           on PyPy.
Index: lang/pypy/pkg-plist
===================================================================
--- lang/pypy/pkg-plist
+++ lang/pypy/pkg-plist
@@ -22,6 +22,7 @@
 %%PYPY_DIR%%/include/code.h
 %%PYPY_DIR%%/include/compile.h
 %%PYPY_DIR%%/include/complexobject.h
+%%PYPY_DIR%%/include/cpyext_datetime.h
 %%PYPY_DIR%%/include/cpyext_descrobject.h
 %%PYPY_DIR%%/include/cpyext_memoryobject.h
 %%PYPY_DIR%%/include/cpyext_object.h
Index: lang/pypy3/distinfo
===================================================================
--- lang/pypy3/distinfo
+++ lang/pypy3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515949994
-SHA256 (pypy3-v5.10.1-src.tar.bz2) = f5548e06e2fc0c24ec8b6e3c5b09f90081818f7caa3e436dc312592611724713
-SIZE (pypy3-v5.10.1-src.tar.bz2) = 29071765
+TIMESTAMP = 1530700264
+SHA256 (pypy3-v6.0.0-src.tar.bz2) = ed8005202b46d6fc6831df1d13a4613bc40084bfa42f275068edadf8954034a3
+SIZE (pypy3-v6.0.0-src.tar.bz2) = 22648140
Index: lang/pypy3/files/patch-pypy_config_pypyoption.py
===================================================================
--- /dev/null
+++ lang/pypy3/files/patch-pypy_config_pypyoption.py
@@ -0,0 +1,11 @@
+--- pypy/config/pypyoption.py.orig	2018-07-04 10:31:39 UTC
++++ pypy/config/pypyoption.py
+@@ -46,7 +46,7 @@ working_modules.update([
+ from rpython.jit.backend import detect_cpu
+ try:
+     if detect_cpu.autodetect().startswith('x86'):
+-        if not sys.platform.startswith('openbsd'):
++        if not (sys.platform.startswith('openbsd') or sys.platform.startswith('freebsd')):
+             working_modules.add('_vmprof')
+             working_modules.add('faulthandler')
+ except detect_cpu.ProcessorAutodetectError:
Index: lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py
===================================================================
--- lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpython/rlib/rvmprof/cintf.py.orig	2017-12-22 10:09:25 UTC
-+++ rpython/rlib/rvmprof/cintf.py
-@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio
- 
- # vmprof works only on x86 for now
- IS_SUPPORTED = detect_cpu.autodetect().startswith('x86')
--if sys.platform == 'win32':
-+if sys.platform in ('freebsd10', 'win32'):
-     IS_SUPPORTED = False
- 
- ROOT = py.path.local(rpythonroot).join('rpython', 'rlib', 'rvmprof')
Index: lang/pypy3/pkg-descr
===================================================================
--- lang/pypy3/pkg-descr
+++ lang/pypy3/pkg-descr
@@ -1,5 +1,5 @@
-PyPy3 (alpha) is a fast, compliant alternative implementation of the Python
-language (3.3.5). It has several advantages and distinct features:
+PyPy3 is a fast, compliant alternative implementation of the Python
+language (3.5.3). It has several advantages and distinct features:
 
  - Speed: thanks to its Just-in-Time compiler, Python programs often run faster
           on PyPy3.
Index: lang/pypy3/pkg-plist
===================================================================
--- lang/pypy3/pkg-plist
+++ lang/pypy3/pkg-plist
@@ -15,6 +15,7 @@
 %%PYPY_DIR%%/include/code.h
 %%PYPY_DIR%%/include/compile.h
 %%PYPY_DIR%%/include/complexobject.h
+%%PYPY_DIR%%/include/cpyext_datetime.h
 %%PYPY_DIR%%/include/cpyext_descrobject.h
 %%PYPY_DIR%%/include/cpyext_genobject.h
 %%PYPY_DIR%%/include/cpyext_memoryobject.h
@@ -2090,6 +2091,7 @@
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pem.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pkcs12.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pkcs7.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pypy_win32_extra.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rand.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rsa.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/src/osrandom_engine.c
@@ -2106,6 +2108,7 @@
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/error.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/errorcodes.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/utility.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/osx-roots.diff
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/tools/make_ssl_data.py
 %%PYPY_DIR%%/lib_pypy/_codecs_cn.py