Attachment #241337 for bug #270670




		llvm/tools/opt-viewer/optrecord.py \
		llvm/utils/lit/lit.py \
		llvm/utils/llvm-lit/llvm-lit.in
LIT_MOD_NAME=	lit${LLVM_SUFFIX:S/-/_/g}

SUB_FILES=	llvm-wrapper.sh
SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"

.endfor

post-patch:
	${REINPLACE_CMD} -e 's|import lit|import ${LIT_MOD_NAME}|' \
	    -e 's|from lit|from ${LIT_MOD_NAME}|' \
	    -e 's|lit\.|${LIT_MOD_NAME}.|g' \
	    ${WRKSRC}/llvm/utils/lit/lit.py \
	    ${WRKSRC}/llvm/utils/lit/lit/*.py \
	    ${WRKSRC}/llvm/utils/lit/lit/formats/*.py

	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
	${LN} -fs ../${LLVM_DIR}/bin/llvm-lit \
	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/builtin_commands
	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/formats
	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \
	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/builtin_commands/
	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \
	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/formats/
	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
	    ${STAGEDIR}${LLVM_PREFIX}/bin/
	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \

	    -e 's|/${LLVM_MAJOR}/|/%%LLVM_MAJOR%%/|' \
	    -e 's|\([-./]\)${LLVM_MAJOR:C/\./\\./}$$|\1%%LLVM_MAJOR%%|' \
	    | ${SORT} >> ${PLIST}.tmp
	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${LIT_MOD_NAME} -type f | \
	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
	    -e 's|${LLVM_MAJOR}|%%LLVM_MAJOR%%|' | \




%%CLANG%%llvm-devel/share/scan-view/ScanView.py
%%CLANG%%llvm-devel/share/scan-view/bugcatcher.ico
%%CLANG%%llvm-devel/share/scan-view/startfile.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/BooleanExpression.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/LitConfig.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/LitTestCase.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ProgressBar.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ShCommands.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ShUtil.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/Test.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestRunner.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestTimes.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestingConfig.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/__init__.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/__init__.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/cat.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/diff.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/cl_arguments.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/discovery.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/display.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/__init__.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/base.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/googletest.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/shtest.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/main.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/reports.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/run.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/util.py
%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/worker.py
@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi

Return to bug 270670

Lines 6183-6213 llvm-devel/share/opt-viewer/style.css Link Here

(-)b/devel/llvm-devel/pkg-plist (-26 / +26 lines)
6183	%%CLANG%%llvm-devel/share/scan-view/ScanView.py	6183	%%CLANG%%llvm-devel/share/scan-view/ScanView.py
6184	%%CLANG%%llvm-devel/share/scan-view/bugcatcher.ico	6184	%%CLANG%%llvm-devel/share/scan-view/bugcatcher.ico
6185	%%CLANG%%llvm-devel/share/scan-view/startfile.py	6185	%%CLANG%%llvm-devel/share/scan-view/startfile.py
6186	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/BooleanExpression.py	6186	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/BooleanExpression.py
6187	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py	6187	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/LitConfig.py
6188	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py	6188	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/LitTestCase.py
6189	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py	6189	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ProgressBar.py
6190	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShCommands.py	6190	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ShCommands.py
6191	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShUtil.py	6191	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ShUtil.py
6192	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/Test.py	6192	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/Test.py
6193	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestRunner.py	6193	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestRunner.py
6194	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestTimes.py	6194	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestTimes.py
6195	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestingConfig.py	6195	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestingConfig.py
6196	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/__init__.py	6196	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/__init__.py
6197	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/builtin_commands/__init__.py	6197	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/__init__.py
6198	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/builtin_commands/cat.py	6198	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/cat.py
6199	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/builtin_commands/diff.py	6199	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/diff.py
6200	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/cl_arguments.py	6200	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/cl_arguments.py
6201	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/discovery.py	6201	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/discovery.py
6202	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/display.py	6202	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/display.py
6203	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/__init__.py	6203	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/__init__.py
6204	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/base.py	6204	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/base.py
6205	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/googletest.py	6205	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/googletest.py
6206	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/shtest.py	6206	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/shtest.py
6207	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/main.py	6207	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/main.py
6208	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/reports.py	6208	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/reports.py
6209	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/run.py	6209	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/run.py
6210	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/util.py	6210	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/util.py
6211	%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/worker.py	6211	%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/worker.py
6212	@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi	6212	@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
6213	@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi	6213	@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi

Lines 54-59 SHEBANG_FILES= \ Link Here

(-)b/devel/llvm-devel/Makefile (-10 / +11 lines)
54	llvm/tools/opt-viewer/optrecord.py \	54	llvm/tools/opt-viewer/optrecord.py \
55	llvm/utils/lit/lit.py \	55	llvm/utils/lit/lit.py \
56	llvm/utils/llvm-lit/llvm-lit.in	56	llvm/utils/llvm-lit/llvm-lit.in
		57	LIT_MOD_NAME= lit${LLVM_SUFFIX:S/-/_/g}
57		58
58	SUB_FILES= llvm-wrapper.sh	59	SUB_FILES= llvm-wrapper.sh
59	SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"	60	SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
Lines 357-365 PLIST_SUB+= ${opt}="@comment " Link Here
357	.endfor	358	.endfor
358		359
359	post-patch:	360	post-patch:
360	${REINPLACE_CMD} -e 's\|import lit\|import lit${LLVM_SUFFIX}\|' \	361	${REINPLACE_CMD} -e 's\|import lit\|import ${LIT_MOD_NAME}\|' \
361	-e 's\|from lit\|from lit${LLVM_SUFFIX}\|' \	362	-e 's\|from lit\|from ${LIT_MOD_NAME}\|' \
362	-e 's\|lit\.\|lit${LLVM_SUFFIX}.\|g' \	363	-e 's\|lit\.\|${LIT_MOD_NAME}.\|g' \
363	${WRKSRC}/llvm/utils/lit/lit.py \	364	${WRKSRC}/llvm/utils/lit/lit.py \
364	${WRKSRC}/llvm/utils/lit/lit/*.py \	365	${WRKSRC}/llvm/utils/lit/lit/*.py \
365	${WRKSRC}/llvm/utils/lit/lit/formats/*.py	366	${WRKSRC}/llvm/utils/lit/lit/formats/*.py
Lines 436-450 post-install-LIT-on: Link Here
436	${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}	437	${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
437	${LN} -fs ../${LLVM_DIR}/bin/llvm-lit \	438	${LN} -fs ../${LLVM_DIR}/bin/llvm-lit \
438	${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}	439	${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
439	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}	440	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
440	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands	441	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/builtin_commands
441	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats	442	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/formats
442	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \	443	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
443	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}	444	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
444	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \	445	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \
445	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands/	446	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/builtin_commands/
446	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \	447	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \
447	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats/	448	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}/formats/
448	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \	449	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
449	${STAGEDIR}${LLVM_PREFIX}/bin/	450	${STAGEDIR}${LLVM_PREFIX}/bin/
450	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \	451	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
Lines 490-496 build-plist: Link Here
490	-e 's\|/${LLVM_MAJOR}/\|/%%LLVM_MAJOR%%/\|' \	491	-e 's\|/${LLVM_MAJOR}/\|/%%LLVM_MAJOR%%/\|' \
491	-e 's\|\([-./]\)${LLVM_MAJOR:C/\./\\./}$$\|\1%%LLVM_MAJOR%%\|' \	492	-e 's\|\([-./]\)${LLVM_MAJOR:C/\./\\./}$$\|\1%%LLVM_MAJOR%%\|' \
492	\| ${SORT} >> ${PLIST}.tmp	493	\| ${SORT} >> ${PLIST}.tmp
493	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f \| \	494	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${LIT_MOD_NAME} -type f \| \
494	${SED} -e 's\|${STAGEDIR}${PYTHON_SITELIBDIR}\|%%LIT%%%%PYTHON_SITELIBDIR%%\|' \	495	${SED} -e 's\|${STAGEDIR}${PYTHON_SITELIBDIR}\|%%LIT%%%%PYTHON_SITELIBDIR%%\|' \
495	-e 's\|${LLVM_RELEASE:C/\./\\./g}\|%%LLVM_RELEASE%%\|' \	496	-e 's\|${LLVM_RELEASE:C/\./\\./g}\|%%LLVM_RELEASE%%\|' \
496	-e 's\|${LLVM_MAJOR}\|%%LLVM_MAJOR%%\|' \| \	497	-e 's\|${LLVM_MAJOR}\|%%LLVM_MAJOR%%\|' \| \