On 2018/10/09 08:33, Sebastien Marie wrote:
> Hi,
>
> While upgrading, I saw the following:
>
> Collision in py-llvm-6.0.1->6.0.1p0: the following files already exist
> /usr/local/lib/python2.7/site-packages/six.py (py-six-1.11.0 and
> py-llvm-6.0.1p0)
>
> $ pkg_locate '*2.7/site-packages/six.py'
> py-llvm-6.0.1p0:devel/llvm,-python:/usr/local/lib/python2.7/site-packages/six.py
> py-six-1.11.0:devel/py-six:/usr/local/lib/python2.7/site-packages/six.py
>
> Thanks.
> --
> Sebastien Marie
>
Ugh. Good catch. @comment in llvm's PLIST-python, I guess...
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- Makefile 6 Oct 2018 15:27:10 -0000 1.188
+++ Makefile 9 Oct 2018 21:48:16 -0000
@@ -20,7 +20,7 @@ PKGSPEC-main = llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py-llvm-${LLVM_V}
REVISION-main = 8
-REVISION-python = 0
+REVISION-python = 1
CATEGORIES = devel
DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \
cfe-${LLVM_V}.src${EXTRACT_SUFX} \
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/devel/llvm/pkg/PLIST-python,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-python
--- pkg/PLIST-python 6 Oct 2018 15:27:10 -0000 1.2
+++ pkg/PLIST-python 9 Oct 2018 21:48:16 -0000
@@ -27,4 +27,4 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/lldb/utils/
lib/python${MODPY_VERSION}/site-packages/lldb/utils/__init__.py
lib/python${MODPY_VERSION}/site-packages/lldb/utils/symbolication.py
-lib/python${MODPY_VERSION}/site-packages/six.py
+@comment lib/python${MODPY_VERSION}/site-packages/six.py
