Install scan-view support files under LLVM_PREFIX and alter

llvm-wrapper to support this.

PR:		193955

3 files changed, 17 insertions, 23 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index fe730079a6f1..9e12863495bb 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	clang
 PORTVERSION=	3.6.r${SVN_REV}
+PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -30,6 +31,7 @@ LLVM_SUFFIX=	-devel
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
+PYTHONLIBDIR=	${LLVM_PREFIX}/lib/python
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
@@ -156,12 +158,12 @@ post-install:
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources
+	${MKDIR} ${STAGEDIR}${PYTHONLIBDIR}
+	${MKDIR} ${STAGEDIR}${PYTHONLIBDIR}/Resources
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/*.py \
-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+	    ${STAGEDIR}${PYTHONLIBDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/Resources/* \
-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources
+	    ${STAGEDIR}${PYTHONLIBDIR}/Resources
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css \
 	    ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js \
@@ -175,12 +177,8 @@ PLIST_FILE_LIST=	${COMMANDS:S|^|bin/|} \
 			lib/libclang*
 PLIST_DIR_LIST=		include/clang \
 			include/clang-c \
-			lib/clang
-PLIST_PYFILE_LIST=	ScanView.py \
-			Reporter.py \
-			Resources/* \
-			startfile.py
-PLIST_PYDIR_LIST=	Resources
+			lib/clang \
+			lib/python
 
 build-plist:
 	${RM} -f ${PLIST}
@@ -200,11 +198,5 @@ build-plist:
 	${FIND} ${STAGEDIR}${DOCSDIR} -type d | ${SORT} -r | \
 	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
 	    >> ${PLIST}
-	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
-	    ls ${PLIST_PYFILE_LIST} | ${SORT} | \
-	    ${SED} -e 's|^|%%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
-	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
-	    ${FIND} ${PLIST_PYDIR_LIST} -type d | ${SORT} -r | \
-	    ${SED} -e 's|^|@dirrm %%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/clang-devel/files/llvm-wrapper.sh.in b/lang/clang-devel/files/llvm-wrapper.sh.in
index 0a460f3156e5..f2b952f530dd 100644
--- a/lang/clang-devel/files/llvm-wrapper.sh.in
+++ b/lang/clang-devel/files/llvm-wrapper.sh.in
@@ -6,5 +6,6 @@ LLVM_SUFFIX="%%LLVM_SUFFIX%%"
 
 tool=$(basename $0)
 tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
+PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${LLVM_PREFIX}/lib/python" \
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
     "${tool}" "${@}"
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 8346f42315b7..44e3fe99a47d 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -507,10 +507,18 @@ llvm-devel/lib/libclangStaticAnalyzerCheckers.a
 llvm-devel/lib/libclangStaticAnalyzerCore.a
 llvm-devel/lib/libclangStaticAnalyzerFrontend.a
 llvm-devel/lib/libclangTooling.a
+llvm-devel/lib/python/Reporter.py
+llvm-devel/lib/python/Resources/FileRadar.scpt
+llvm-devel/lib/python/Resources/GetRadarVersion.scpt
+llvm-devel/lib/python/Resources/bugcatcher.ico
+llvm-devel/lib/python/ScanView.py
+llvm-devel/lib/python/startfile.py
 man/man1/clang-devel.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
+@dirrm llvm-devel/lib/python/Resources
+@dirrm llvm-devel/lib/python
 @dirrm llvm-devel/lib/clang/3.6.0/include
 @dirrm llvm-devel/lib/clang/3.6.0
 @dirrm llvm-devel/lib/clang
@@ -552,10 +560,3 @@ man/man1/clang-devel.1.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PYTHON_SITELIBDIR%%/Reporter.py
-%%PYTHON_SITELIBDIR%%/Resources/FileRadar.scpt
-%%PYTHON_SITELIBDIR%%/Resources/GetRadarVersion.scpt
-%%PYTHON_SITELIBDIR%%/Resources/bugcatcher.ico
-%%PYTHON_SITELIBDIR%%/ScanView.py
-%%PYTHON_SITELIBDIR%%/startfile.py
-@dirrm %%PYTHON_SITELIBDIR%%/Resources