# HG changeset patch # User Franz Glasner # Date 1705252821 -3600 # Node ID 0110ab1309c12c9c32aebb7bee8760afeadfa81b # Parent f7c419148b31414a9c3f769c8f429ed6d9ec4915 FIX: Allow to install pypy39 and pypy310 at the same time: move colliding LICENSE and README files diff -r f7c419148b31 -r 0110ab1309c1 lang/pypy310/Makefile --- 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 diff -r f7c419148b31 -r 0110ab1309c1 lang/pypy310/pkg-plist --- 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 diff -r f7c419148b31 -r 0110ab1309c1 lang/pypy39/Makefile --- 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 diff -r f7c419148b31 -r 0110ab1309c1 lang/pypy39/pkg-plist --- 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