From owner-svn-ports-head@FreeBSD.ORG Fri Sep 26 20:05:55 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC7DCBB6; Fri, 26 Sep 2014 20:05:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CAADE49; Fri, 26 Sep 2014 20:05:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8QK5te1056105; Fri, 26 Sep 2014 20:05:55 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8QK5sln056101; Fri, 26 Sep 2014 20:05:54 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201409262005.s8QK5sln056101@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 26 Sep 2014 20:05:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369336 - in head/lang/clang-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2014 20:05:55 -0000 Author: brooks Date: Fri Sep 26 20:05:54 2014 New Revision: 369336 URL: http://svnweb.freebsd.org/changeset/ports/369336 QAT: https://qat.redports.org/buildarchive/r369336/ Log: Install scan-view support files under LLVM_PREFIX and alter llvm-wrapper to support this. PR: 193955 Modified: head/lang/clang-devel/Makefile head/lang/clang-devel/files/llvm-wrapper.sh.in head/lang/clang-devel/pkg-plist Modified: head/lang/clang-devel/Makefile ============================================================================== --- head/lang/clang-devel/Makefile Fri Sep 26 19:50:35 2014 (r369335) +++ head/lang/clang-devel/Makefile Fri Sep 26 20:05:54 2014 (r369336) @@ -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 Modified: head/lang/clang-devel/files/llvm-wrapper.sh.in ============================================================================== --- head/lang/clang-devel/files/llvm-wrapper.sh.in Fri Sep 26 19:50:35 2014 (r369335) +++ head/lang/clang-devel/files/llvm-wrapper.sh.in Fri Sep 26 20:05:54 2014 (r369336) @@ -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}" "${@}" Modified: head/lang/clang-devel/pkg-plist ============================================================================== --- head/lang/clang-devel/pkg-plist Fri Sep 26 19:50:35 2014 (r369335) +++ head/lang/clang-devel/pkg-plist Fri Sep 26 20:05:54 2014 (r369336) @@ -507,10 +507,18 @@ llvm-devel/lib/libclangStaticAnalyzerChe 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