Date: Wed, 12 Jun 2013 23:11:33 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320729 - head/lang/clang33 Message-ID: <201306122311.r5CNBXtR092349@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Jun 12 23:11:32 2013 New Revision: 320729 URL: http://svnweb.freebsd.org/changeset/ports/320729 Log: Fix two plist bugs. Only install the manpage as clang33.1 not also as clang.1. Include clang-format in the set of commands. Modified: head/lang/clang33/Makefile head/lang/clang33/pkg-plist Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Wed Jun 12 23:01:23 2013 (r320728) +++ head/lang/clang33/Makefile Wed Jun 12 23:11:32 2013 (r320729) @@ -2,7 +2,7 @@ PORTNAME= clang DISTVERSION= 3.3rc3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/pre-releases/3.3/rc3/ DISTNAME= cfe-source-${DISTVERSION} @@ -51,6 +51,8 @@ OPTIONS_DEFINE= ASSERTS DOCS ASSERTS_DESC= Enable assertions (thread unsafe) CONFIGURE_ARGS+= --enable-optimized +# Build some docs manually later +CONFIGURE_ARGS+= --disable-docs MAN1= clang${LLVM_SUFFIX}.1 @@ -61,6 +63,7 @@ COMMANDS= c-index-test \ clang++ \ clang-check \ clang-cpp \ + clang-format \ clang-tblgen FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} @@ -74,12 +77,6 @@ CONFIGURE_ARGS+= --disable-assertions RELTYPE= Release .endif -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --enable-docs -.else -CONFIGURE_ARGS+= --disable-docs -.endif - .include <bsd.port.pre.mk> .if ${ARCH} == "sparc64" @@ -108,7 +105,10 @@ pre-build: cd ${WRKSRC}/utils/unittest && ${GMAKE} post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1 + @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} man +.if ${PORT_OPTIONS:MDOCS} + @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} html ps +.endif post-install: ${LN} -sf ${LLVM_PREFIX}/bin/clang ${LLVM_PREFIX}/bin/clang-cpp @@ -118,6 +118,9 @@ post-install: ${LN} -f ${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ ${PREFIX}/bin/${command}${LLVM_SUFFIX} .endfor +.if ${PORT_OPTIONS:MDOCS} + cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} install-html install-ps +.endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 Modified: head/lang/clang33/pkg-plist ============================================================================== --- head/lang/clang33/pkg-plist Wed Jun 12 23:01:23 2013 (r320728) +++ head/lang/clang33/pkg-plist Wed Jun 12 23:11:32 2013 (r320729) @@ -3,12 +3,14 @@ bin/clang33 bin/clang++33 bin/clang-check33 bin/clang-cpp33 +bin/clang-format33 bin/clang-tblgen33 llvm33/bin/c-index-test llvm33/bin/clang llvm33/bin/clang++ llvm33/bin/clang-check llvm33/bin/clang-cpp +llvm33/bin/clang-format llvm33/bin/clang-tblgen llvm33/include/clang-c/CXCompilationDatabase.h llvm33/include/clang-c/CXString.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306122311.r5CNBXtR092349>