svn commit: r439901 - in head/lang: pypy pypy3
David Naylor
dbn at FreeBSD.org
Mon May 1 18:00:59 UTC 2017
Author: dbn
Date: Mon May 1 18:00:57 2017
New Revision: 439901
URL: https://svnweb.freebsd.org/changeset/ports/439901
Log:
lang/pypy3: un-conflict with pypy
- ensure pypy3's directory under $PREFIX is unique to pypy's.
- remove swap files from pkg-plist (i.e. revert r439409).
PR: 218838
Reported by: Yunchih Chen <yunchih at csie.ntu.edu.tw>
Modified:
head/lang/pypy/Makefile
head/lang/pypy/bsd.pypy.mk
head/lang/pypy3/Makefile
head/lang/pypy3/pkg-plist
Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile Mon May 1 14:55:06 2017 (r439900)
+++ head/lang/pypy/Makefile Mon May 1 18:00:57 2017 (r439901)
@@ -109,6 +109,9 @@ PYPY_BITS= 64
.endif
PLIST_SUB+= PYPY_BITS="${PYPY_BITS}"
+post-extract:
+ ${FIND} ${WRKSRC} -name '*.swn' -delete
+
pre-build:
if [ ! -f ${BUILD_WRKSRC}/Makefile ]; then \
${RM} -r ${WRKDIR}/build; \
@@ -156,7 +159,7 @@ pkg-plist: stage
-e '/\/$$/d' \
${WRKDIR}/.plist-files-gen
${ECHO} bin/${PORTNAME} > ${WRKDIR}/pkg-plist
- ${SORT} ${WRKDIR}/.plist-files-gen | ${GREP} -v '\.swn$$\|\.orig' >> ${WRKDIR}/pkg-plist
+ ${SORT} ${WRKDIR}/.plist-files-gen | ${GREP} -v '\.orig' >> ${WRKDIR}/pkg-plist
${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist
.include <bsd.port.post.mk>
Modified: head/lang/pypy/bsd.pypy.mk
==============================================================================
--- head/lang/pypy/bsd.pypy.mk Mon May 1 14:55:06 2017 (r439900)
+++ head/lang/pypy/bsd.pypy.mk Mon May 1 18:00:57 2017 (r439901)
@@ -7,6 +7,6 @@ LICENSE_COMB= multi
USES+= compiler:c11
-PYPY_DIR= pypy-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
+PYPY_DIR= ${PORTNAME}-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
PYPY_CFFI_VER?= pypy-41
PLIST_SUB+= PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER}
Modified: head/lang/pypy3/Makefile
==============================================================================
--- head/lang/pypy3/Makefile Mon May 1 14:55:06 2017 (r439900)
+++ head/lang/pypy3/Makefile Mon May 1 18:00:57 2017 (r439901)
@@ -3,7 +3,7 @@
PORTNAME= pypy3
DISTVERSION= 5.7.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTNAME= ${PORTNAME}-v${DISTVERSION}-src
MASTERDIR= ${.CURDIR}/../pypy
Modified: head/lang/pypy3/pkg-plist
==============================================================================
--- head/lang/pypy3/pkg-plist Mon May 1 14:55:06 2017 (r439900)
+++ head/lang/pypy3/pkg-plist Mon May 1 18:00:57 2017 (r439901)
@@ -2033,7 +2033,6 @@ bin/pypy3
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/.gitignore
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/LICENSE
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/README.md
-%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/.build_openssl.py.swn
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/__init__.py
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_commoncrypto.py
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_constant_time.py
@@ -2098,7 +2097,6 @@ bin/pypy3
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509name.py
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509v3.py
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/utils.py
-%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/.__init__.py.swn
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/__init__.py
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/certificate.py
%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/error.py
More information about the svn-ports-all
mailing list