Index: lang/pypy/Makefile
===================================================================
--- lang/pypy/Makefile	(revision 531839)
+++ lang/pypy/Makefile	(working copy)
@@ -35,6 +35,7 @@
 PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
 TRANS_DESC=	Translation method
 LOCALBASE?=	/usr/local
+# Only allow building with pypy if it wouldn't cause a dependency loop (pypy depending on itself)
 .if exists(${LOCALBASE}/bin/pypy) || ${PORTNAME} != pypy
 OPTIONS_SINGLE_TRANS+=	PYPY PYPY_MINMEM
 . if exists(${LOCALBASE}/bin/pypy)
@@ -47,7 +48,7 @@
 .endif
 
 ALL_TARGET=	${PORTNAME}-c
-BUILD_WRKSRC?=	${WRKDIR}/build/usession-release-pypy2.7-v${DISTVERSION}rc4-0/testing_1
+BUILD_WRKSRC?=	${WRKDIR}/build/usession-${PORTNAME}-0/testing_1
 MAKE_ENV+=	PYPY_LOCALBASE=${LOCALBASE} LDSHARED="${CC} -shared"
 PACKAGE_ARGS?=	--without-gdbm --without-sqlite3 --without-tk
 LLD_UNSAFE=	yes
@@ -99,11 +100,10 @@
 
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
-MASTERDIR?=	${.CURDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-.include "${MASTERDIR}/bsd.pypy.mk"
+.include "bsd.pypy.mk"
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${ARCH} != i386 && ${ARCH} != amd64
@@ -112,15 +112,12 @@
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-post-extract:
-	${FIND} ${WRKSRC} -name '*.swn' -delete
-
 pre-build:
 	if [ ! -f ${BUILD_WRKSRC}/Makefile ]; then \
 		${RM} -r ${WRKDIR}/build; \
 		${MKDIR} ${WRKDIR}/build; \
 		(cd ${WRKSRC}/pypy/goal; \
-			${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \
+			${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYPY_USESSION_BASENAME=${PORTNAME} \
 			${PYTHON_CMD} ../../rpython/bin/rpython --source -Ojit targetpypystandalone.py ${PYPY_ARGS}); \
 	fi
 
Index: lang/pypy3/Makefile
===================================================================
--- lang/pypy3/Makefile	(revision 531839)
+++ lang/pypy3/Makefile	(working copy)
@@ -7,7 +7,6 @@
 MASTERDIR=	${.CURDIR}/../pypy
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.6-v${DISTVERSION:C/-.*//}-src
-BUILD_WRKSRC?=	${WRKDIR}/build/usession-release-${PORTNAME}.6-v${DISTVERSION:C/-.*//}rc4-0/testing_1
 
 SHEBANG_FILES=	\
 		lib-python/3/base64.py \