diff options
| author | dbn <dbn@FreeBSD.org> | 2017-05-02 02:00:57 +0800 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2017-05-02 02:00:57 +0800 |
| commit | 74627a5e6c8d8415670d8d091c070b2f7713a809 (patch) | |
| tree | b30b63f7be91a6bce950c6c98e0674a8a05510af /lang/pypy | |
| parent | 4619ee67513b5d8df545f20772daa050ae555906 (diff) | |
| download | freebsd-ports-gnome-74627a5e6c8d8415670d8d091c070b2f7713a809.tar.gz freebsd-ports-gnome-74627a5e6c8d8415670d8d091c070b2f7713a809.tar.zst freebsd-ports-gnome-74627a5e6c8d8415670d8d091c070b2f7713a809.zip | |
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@csie.ntu.edu.tw>
Diffstat (limited to 'lang/pypy')
| -rw-r--r-- | lang/pypy/Makefile | 5 | ||||
| -rw-r--r-- | lang/pypy/bsd.pypy.mk | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index 7f9574901904..23a0fd27c1c6 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -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> diff --git a/lang/pypy/bsd.pypy.mk b/lang/pypy/bsd.pypy.mk index a8bb16748f9a..e4b67bf11306 100644 --- a/lang/pypy/bsd.pypy.mk +++ b/lang/pypy/bsd.pypy.mk @@ -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} |