Index: Makefile
===================================================================
--- Makefile	(revision 402096)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pypy
-PORTVERSION=	2.6.1
+PORTVERSION=	4.0.1
 CATEGORIES=	lang python
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy
 DISTNAME=	release-${DISTVERSION}
@@ -35,7 +35,7 @@
 MAKE_ENV+=	PYPY_LOCALBASE=${LOCALBASE}
 USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
 USES=		gettext-runtime tar:bzip2
-WRKSRC=		${WRKDIR}/pypy-pypy-f3ad1e1e1d62
+WRKSRC=		${WRKDIR}/pypy-pypy-5f8302b8bf9f
 
 .include ".${CURDIR}/bsd.pypy.mk"
 .include <bsd.port.options.mk>
Index: bsd.pypy.cffi.mk
===================================================================
--- bsd.pypy.cffi.mk	(revision 402096)
+++ bsd.pypy.cffi.mk	(working copy)
@@ -10,7 +10,7 @@
 
 CFFI_MODULE?=	_${PORTNAME}
 
-PYTHON_PORTVERSION=	2.6.1
+PYTHON_PORTVERSION=	4.0.1
 PYTHON_PKGNAMEPREFIX=	pypy-
 PYTHON_CMD=	${LOCALBASE}/bin/pypy
 
Index: bsd.pypy.mk
===================================================================
--- bsd.pypy.mk	(revision 402096)
+++ bsd.pypy.mk	(working copy)
@@ -6,5 +6,5 @@
 USES+=		compiler:c11
 
 PYPY_DIR=	pypy-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
-PYPY_VER=	${PORTVERSION:C|([0-9])\.([0-9]).*|\1\2|}
-PLIST_SUB+=	PYPY_DIR=${PYPY_DIR} PYPY_VER=${PYPY_VER}
+PYPY_CFFI_VER=	26
+PLIST_SUB+=	PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER}
Index: distinfo
===================================================================
--- distinfo	(revision 402096)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pypy/release-2.6.1.tar.bz2) = cc80e04957b899fe3c5d1b0b36979a4e80b7baf98f4c660c0fca781b6f148327
-SIZE (pypy/release-2.6.1.tar.bz2) = 16828274
+SHA256 (pypy/release-4.0.1.tar.bz2) = 743928a65a3a8731a1403003729f4a5cbefeaf7841e9eb677bd2b547e98df1bc
+SIZE (pypy/release-4.0.1.tar.bz2) = 17022282
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 402096)
+++ pkg-plist	(working copy)
@@ -2041,7 +2041,7 @@
 %%PYPY_DIR%%/lib-python/2.7/zipfile.py
 %%PYPY_DIR%%/lib_pypy/__init__.py
 %%PYPY_DIR%%/lib_pypy/_audioop_build.py
-%%PYPY_DIR%%/lib_pypy/_audioop_cffi.pypy-%%PYPY_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_audioop_cffi.pypy-%%PYPY_CFFI_VER%%.so
 %%PYPY_DIR%%/lib_pypy/_codecs_cn.py
 %%PYPY_DIR%%/lib_pypy/_codecs_hk.py
 %%PYPY_DIR%%/lib_pypy/_codecs_iso2022.py
@@ -2066,7 +2066,7 @@
 %%PYPY_DIR%%/lib_pypy/_ctypes_test.py
 %%PYPY_DIR%%/lib_pypy/_curses.py
 %%PYPY_DIR%%/lib_pypy/_curses_build.py
-%%PYPY_DIR%%/lib_pypy/_curses_cffi.pypy-%%PYPY_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_curses_cffi.pypy-%%PYPY_CFFI_VER%%.so
 %%PYPY_DIR%%/lib_pypy/_curses_panel.py
 %%PYPY_DIR%%/lib_pypy/_elementtree.py
 %%PYPY_DIR%%/lib_pypy/_ffi.py
@@ -2075,7 +2075,7 @@
 %%PYPY_DIR%%/lib_pypy/_marshal.py
 %%PYPY_DIR%%/lib_pypy/_md5.py
 %%PYPY_DIR%%/lib_pypy/_pwdgrp_build.py
-%%PYPY_DIR%%/lib_pypy/_pwdgrp_cffi.pypy-%%PYPY_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_pwdgrp_cffi.pypy-%%PYPY_CFFI_VER%%.so
 %%PYPY_DIR%%/lib_pypy/_pypy_interact.py
 %%PYPY_DIR%%/lib_pypy/_pypy_irc_topic.py
 %%PYPY_DIR%%/lib_pypy/_pypy_testcapi.py
@@ -2089,7 +2089,7 @@
 %%PYPY_DIR%%/lib_pypy/_structseq.py
 %%PYPY_DIR%%/lib_pypy/_subprocess.py
 %%PYPY_DIR%%/lib_pypy/_syslog_build.py
-%%PYPY_DIR%%/lib_pypy/_syslog_cffi.pypy-%%PYPY_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_syslog_cffi.pypy-%%PYPY_CFFI_VER%%.so
 %%PYPY_DIR%%/lib_pypy/_testcapi.py
 %%PYPY_DIR%%/lib_pypy/_testcapimodule.c
 %%PYPY_DIR%%/lib_pypy/_tkinter/__init__.py