Mercurial > hgrepos > FreeBSD > ports > PyPy

changeset 136:0110ab1309c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Allow to install pypy39 and pypy310 at the same time: move colliding LICENSE and README files
author Franz Glasner <fzglas.hg@dom66.de>
date Sun, 14 Jan 2024 18:20:21 +0100
parents f7c419148b31
children aa62b751b2af
files lang/pypy310/Makefile lang/pypy310/pkg-plist lang/pypy39/Makefile lang/pypy39/pkg-plist
diffstat 4 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lang/pypy310/Makefile	Sun Jan 14 17:51:37 2024 +0100
+++ b/lang/pypy310/Makefile	Sun Jan 14 18:20:21 2024 +0100
@@ -77,6 +77,7 @@
 PLIST_SUB+=	PYPY_DIR=${PYPY_DIR} \
 		PYPY_CFFI_VER=${PYPY_CFFI_VER} \
 		PYPY_LDLIBRARY=${PYPY_LDLIBRARY} \
+		PKGNAME=${PKGNAME} \
 		PYTHON_IMPL_MINOR=pypy${PYPY_PYTHON_IMPL_VER} \
 		PY_VERSION_SHORT=${PYPY_PYTHON_IMPL_VER} \
 		PYPY_BCTAG=${PYPY_BCTAG}
@@ -165,6 +166,9 @@
 			${PYTHON_CMD} ${WRKSRC}/pypy/tool/release/package.py --builddir ${WRKDIR}/build --archive-name ${PYPY_DIR} \
 				${PACKAGE_ARGS})
 	${EXTRACT_CMD} -C ${STAGEDIR}${PREFIX} -xf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2
+	${MV} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/LICENSE ${STAGEDIR}${PREFIX}/${PYPY_DIR}/LICENSE-${PKGNAME}
+	${MV} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/README.rst ${STAGEDIR}${PREFIX}/${PYPY_DIR}/README-${PKGNAME}.rst
+	${MV} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/include/README ${STAGEDIR}${PREFIX}/${PYPY_DIR}/include/README-${PKGNAME}
 	${RM} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/bin/${PYPY_TAG}
 	${RM} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/bin/${PYPY_TAG}${PYPY_PYTHON_IMPL_VER_MAJOR}
 	${RM} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/bin/python
--- a/lang/pypy310/pkg-plist	Sun Jan 14 17:51:37 2024 +0100
+++ b/lang/pypy310/pkg-plist	Sun Jan 14 18:20:21 2024 +0100
@@ -1,10 +1,10 @@
 bin/%%PYTHON_IMPL_MINOR%%
-%%PYPY_DIR%%/LICENSE
-%%PYPY_DIR%%/README.rst
+%%PYPY_DIR%%/LICENSE-%%PKGNAME%%
+%%PYPY_DIR%%/README-%%PKGNAME%%.rst
 %%PYPY_DIR%%/bin/%%PYPY_LDLIBRARY%%
 %%PYPY_DIR%%/bin/%%PYTHON_IMPL_MINOR%%
 %%PYPY_DIR%%/bin/python%%PY_VERSION_SHORT%%
-%%PYPY_DIR%%/include/README
+%%PYPY_DIR%%/include/README-%%PKGNAME%%
 %%PYPY_DIR%%/include/%%PYTHON_IMPL_MINOR%%/Python.h
 %%PYPY_DIR%%/include/%%PYTHON_IMPL_MINOR%%/abstract.h
 %%PYPY_DIR%%/include/%%PYTHON_IMPL_MINOR%%/boolobject.h
--- a/lang/pypy39/Makefile	Sun Jan 14 17:51:37 2024 +0100
+++ b/lang/pypy39/Makefile	Sun Jan 14 18:20:21 2024 +0100
@@ -77,6 +77,7 @@
 PLIST_SUB+=	PYPY_DIR=${PYPY_DIR} \
 		PYPY_CFFI_VER=${PYPY_CFFI_VER} \
 		PYPY_LDLIBRARY=${PYPY_LDLIBRARY} \
+		PKGNAME=${PKGNAME} \
 		PYTHON_IMPL_MINOR=pypy${PYPY_PYTHON_IMPL_VER} \
 		PY_VERSION_SHORT=${PYPY_PYTHON_IMPL_VER} \
 		PYPY_BCTAG=${PYPY_BCTAG}
@@ -166,6 +167,9 @@
 			${PYTHON_CMD} ${WRKSRC}/pypy/tool/release/package.py --builddir ${WRKDIR}/build --archive-name ${PYPY_DIR} \
 				${PACKAGE_ARGS})
 	${EXTRACT_CMD} -C ${STAGEDIR}${PREFIX} -xf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2
+	${MV} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/LICENSE ${STAGEDIR}${PREFIX}/${PYPY_DIR}/LICENSE-${PKGNAME}
+	${MV} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/README.rst ${STAGEDIR}${PREFIX}/${PYPY_DIR}/README-${PKGNAME}.rst
+	${MV} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/include/README ${STAGEDIR}${PREFIX}/${PYPY_DIR}/include/README-${PKGNAME}
 	${RM} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/bin/${PYPY_TAG}
 	${RM} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/bin/${PYPY_TAG}${PYPY_PYTHON_IMPL_VER_MAJOR}
 	${RM} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/bin/python
--- a/lang/pypy39/pkg-plist	Sun Jan 14 17:51:37 2024 +0100
+++ b/lang/pypy39/pkg-plist	Sun Jan 14 18:20:21 2024 +0100
@@ -1,10 +1,10 @@
 bin/%%PYTHON_IMPL_MINOR%%
-%%PYPY_DIR%%/LICENSE
-%%PYPY_DIR%%/README.rst
+%%PYPY_DIR%%/LICENSE-%%PKGNAME%%
+%%PYPY_DIR%%/README-%%PKGNAME%%.rst
 %%PYPY_DIR%%/bin/%%PYPY_LDLIBRARY%%
 %%PYPY_DIR%%/bin/%%PYTHON_IMPL_MINOR%%
 %%PYPY_DIR%%/bin/python%%PY_VERSION_SHORT%%
-%%PYPY_DIR%%/include/README
+%%PYPY_DIR%%/include/README-%%PKGNAME%%
 %%PYPY_DIR%%/include/%%PYTHON_IMPL_MINOR%%/Python.h
 %%PYPY_DIR%%/include/%%PYTHON_IMPL_MINOR%%/abstract.h
 %%PYPY_DIR%%/include/%%PYTHON_IMPL_MINOR%%/boolobject.h