Index: head/lang/pypy/Makefile
===================================================================
--- head/lang/pypy/Makefile
+++ head/lang/pypy/Makefile
@@ -105,7 +105,7 @@
 .include "${MASTERDIR}/bsd.pypy.mk"
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1100000 || (${ARCH} != i386 && ${ARCH} != amd64))
+.if ${OPSYS} == FreeBSD && ${ARCH} != i386 && ${ARCH} != amd64
 PYPY_ARGS=	--withoutmod-_vmprof
 .else
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
Index: head/lang/pypy/bsd.pypy.mk
===================================================================
--- head/lang/pypy/bsd.pypy.mk
+++ head/lang/pypy/bsd.pypy.mk
@@ -13,8 +13,10 @@
 
 .if ${PYTHON_IMPL} == pypy
 DISTVERSION=	6.0.0
+PORTREVISION=	1
 PYPY_CFFI_VER=	${PYTHON_IMPL}-41
 .else # ${PYTHON_IMPL} == pypy3
 DISTVERSION=	6.0.0
+PORTREVISION=	1
 PYPY_CFFI_VER=	${PYTHON_IMPL}-${DISTVERSION:S|.||:C|\..*||}-${OPSYS:tl}${OSREL:C|\..*||}
 .endif
Index: head/lang/pypy/files/patch-pypy_config_pypyoption.py
===================================================================
--- head/lang/pypy/files/patch-pypy_config_pypyoption.py
+++ head/lang/pypy/files/patch-pypy_config_pypyoption.py
@@ -1,11 +0,0 @@
---- 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: head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py
===================================================================
--- head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py
+++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py
@@ -0,0 +1,11 @@
+--- rpython/rlib/rvmprof/cintf.py.orig	2018-04-24 06:04:29 UTC
++++ rpython/rlib/rvmprof/cintf.py
+@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio
+ 
+ # vmprof works only on x86 for now
+ IS_SUPPORTED = False
+-if sys.platform in ('darwin', 'linux', 'linux2'):
++if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'):
+     try:
+         IS_SUPPORTED = detect_cpu.autodetect().startswith('x86')
+     except detect_cpu.ProcessorAutodetectError:
Index: head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h
===================================================================
--- head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h
+++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h
@@ -0,0 +1,12 @@
+--- rpython/rlib/rvmprof/src/shared/vmprof_unix.h.orig	2018-07-19 09:03:21 UTC
++++ rpython/rlib/rvmprof/src/shared/vmprof_unix.h
+@@ -24,6 +24,9 @@
+ 
+ #include "vmprof_mt.h"
+ 
++#ifdef __FreeBSD__
++#include <ucontext.h>
++#endif
+ #include <signal.h>
+ 
+ RPY_EXTERN void vmprof_ignore_signals(int ignored);
Index: head/lang/pypy3/files/patch-pypy_config_pypyoption.py
===================================================================
--- head/lang/pypy3/files/patch-pypy_config_pypyoption.py
+++ head/lang/pypy3/files/patch-pypy_config_pypyoption.py
@@ -1,11 +0,0 @@
---- 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: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py
===================================================================
--- head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py
+++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py
@@ -0,0 +1,11 @@
+--- rpython/rlib/rvmprof/cintf.py.orig	2018-04-24 06:04:29 UTC
++++ rpython/rlib/rvmprof/cintf.py
+@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio
+ 
+ # vmprof works only on x86 for now
+ IS_SUPPORTED = False
+-if sys.platform in ('darwin', 'linux', 'linux2'):
++if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'):
+     try:
+         IS_SUPPORTED = detect_cpu.autodetect().startswith('x86')
+     except detect_cpu.ProcessorAutodetectError:
Index: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h
===================================================================
--- head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h
+++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h
@@ -0,0 +1,12 @@
+--- rpython/rlib/rvmprof/src/shared/vmprof_unix.h.orig	2018-07-19 09:03:21 UTC
++++ rpython/rlib/rvmprof/src/shared/vmprof_unix.h
+@@ -24,6 +24,9 @@
+ 
+ #include "vmprof_mt.h"
+ 
++#ifdef __FreeBSD__
++#include <ucontext.h>
++#endif
+ #include <signal.h>
+ 
+ RPY_EXTERN void vmprof_ignore_signals(int ignored);