3 files changed, 144 insertions, 116 deletions

diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index 605060566c0b..39be08e60eae 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -32,6 +32,12 @@ CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
+.if defined(NOPORTDOCS)
+DOCSRCDIR=	
+.else
+DOCSRCDIR=	docs
+.endif
+
 MAN1=		bugpoint.1 llc.1 lli.1 llvm-ar.1 \
 		llvm-as.1 llvm-bcanalyzer.1 llvm-config.1 llvm-db.1 \
 		llvm-dis.1 llvm-extract.1 llvm-ld.1 llvm-link.1 llvm-nm.1 \
@@ -39,12 +45,20 @@ MAN1=		bugpoint.1 llc.1 lli.1 llvm-ar.1 \
 		llvmgxx.1 opt.1 stkrc.1 tblgen.1
 
 post-patch:
-	${REINPLACE_CMD} -e 's,\(PROJ_docsdir.*:=\).*$$,\1${DOCSDIR},g' \
-		${WRKSRC}/Makefile.config.in
-	${REINPLACE_CMD} -e 's,\(PROJ_mandir.*:=\).*$$,\1${MANPREFIX}/man,g' \
-		${WRKSRC}/Makefile.config.in
+	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
+	    ${WRKSRC}/Makefile.config.in
+	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
+	    ${WRKSRC}/Makefile.config.in
+	${REINPLACE_CMD} -e 's|%%DOCSRCDIR%%|${DOCSRCDIR}|' \
+	    ${WRKSRC}/Makefile
+
+post-build:
+	cd ${WRKSRC}/docs/CommandGuide && \
+	    ${GMAKE} man
 
 post-install:
+	cd ${WRKSRC}/docs/CommandGuide && \
+	    ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
 	@${RM} ${PREFIX}/bin/.dir \
 	   ${PREFIX}/lib/.dir
 
diff --git a/devel/llvm/files/patch-Makefile b/devel/llvm/files/patch-Makefile
new file mode 100644
index 000000000000..774f0db717fe
--- /dev/null
+++ b/devel/llvm/files/patch-Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
+@@ -18,7 +18,7 @@
+ #   6. Build tools, runtime, docs.
+ #
+ DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+-        tools runtime docs
++        tools runtime %%DOCSRCDIR%%
+ 
+ OPTIONAL_DIRS := examples projects bindings
+ EXTRA_DIST := test llvm.spec include win32 Xcode
diff --git a/devel/llvm/pkg-plist b/devel/llvm/pkg-plist
index ab4358af7fcc..bda991d602d3 100644
--- a/devel/llvm/pkg-plist
+++ b/devel/llvm/pkg-plist
@@ -331,111 +331,111 @@ lib/libLLVMTarget.a
 lib/libLLVMTransformUtils.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
-%%DOCSDIR%%/html.tar.gz
-%%DOCSDIR%%/html/AliasAnalysis.html
-%%DOCSDIR%%/html/BitCodeFormat.html
-%%DOCSDIR%%/html/Bugpoint.html
-%%DOCSDIR%%/html/CFEBuildInstrs.html
-%%DOCSDIR%%/html/CodeGenerator.html
-%%DOCSDIR%%/html/CodingStandards.html
-%%DOCSDIR%%/html/CommandGuide/bugpoint.html
-%%DOCSDIR%%/html/CommandGuide/index.html
-%%DOCSDIR%%/html/CommandGuide/llc.html
-%%DOCSDIR%%/html/CommandGuide/lli.html
-%%DOCSDIR%%/html/CommandGuide/llvm-ar.html
-%%DOCSDIR%%/html/CommandGuide/llvm-as.html
-%%DOCSDIR%%/html/CommandGuide/llvm-bcanalyzer.html
-%%DOCSDIR%%/html/CommandGuide/llvm-config.html
-%%DOCSDIR%%/html/CommandGuide/llvm-db.html
-%%DOCSDIR%%/html/CommandGuide/llvm-dis.html
-%%DOCSDIR%%/html/CommandGuide/llvm-extract.html
-%%DOCSDIR%%/html/CommandGuide/llvm-ld.html
-%%DOCSDIR%%/html/CommandGuide/llvm-link.html
-%%DOCSDIR%%/html/CommandGuide/llvm-nm.html
-%%DOCSDIR%%/html/CommandGuide/llvm-prof.html
-%%DOCSDIR%%/html/CommandGuide/llvm-ranlib.html
-%%DOCSDIR%%/html/CommandGuide/llvmgcc.html
-%%DOCSDIR%%/html/CommandGuide/llvmgxx.html
-%%DOCSDIR%%/html/CommandGuide/manpage.css
-%%DOCSDIR%%/html/CommandGuide/opt.html
-%%DOCSDIR%%/html/CommandGuide/stkrc.html
-%%DOCSDIR%%/html/CommandGuide/tblgen.html
-%%DOCSDIR%%/html/CommandLine.html
-%%DOCSDIR%%/html/CompilerDriver.html
-%%DOCSDIR%%/html/CompilerWriterInfo.html
-%%DOCSDIR%%/html/DeveloperPolicy.html
-%%DOCSDIR%%/html/ExceptionHandling.html
-%%DOCSDIR%%/html/ExtendingLLVM.html
-%%DOCSDIR%%/html/FAQ.html
-%%DOCSDIR%%/html/GCCFEBuildInstrs.html
-%%DOCSDIR%%/html/GarbageCollection.html
-%%DOCSDIR%%/html/GetElementPtr.html
-%%DOCSDIR%%/html/GettingStarted.html
-%%DOCSDIR%%/html/GettingStartedVS.html
-%%DOCSDIR%%/html/HowToReleaseLLVM.html
-%%DOCSDIR%%/html/HowToSubmitABug.html
-%%DOCSDIR%%/html/LangRef.html
-%%DOCSDIR%%/html/Lexicon.html
-%%DOCSDIR%%/html/LinkTimeOptimization.html
-%%DOCSDIR%%/html/MakefileGuide.html
-%%DOCSDIR%%/html/Passes.html
-%%DOCSDIR%%/html/ProgrammersManual.html
-%%DOCSDIR%%/html/Projects.html
-%%DOCSDIR%%/html/ReleaseNotes.html
-%%DOCSDIR%%/html/SourceLevelDebugging.html
-%%DOCSDIR%%/html/Stacker.html
-%%DOCSDIR%%/html/SystemLibrary.html
-%%DOCSDIR%%/html/TableGenFundamentals.html
-%%DOCSDIR%%/html/TestingGuide.html
-%%DOCSDIR%%/html/UsingLibraries.html
-%%DOCSDIR%%/html/WritingAnLLVMBackend.html
-%%DOCSDIR%%/html/WritingAnLLVMPass.html
-%%DOCSDIR%%/html/doxygen.css
-%%DOCSDIR%%/html/img/Debugging.gif
-%%DOCSDIR%%/html/img/libdeps.gif
-%%DOCSDIR%%/html/img/lines.gif
-%%DOCSDIR%%/html/img/objdeps.gif
-%%DOCSDIR%%/html/img/venusflytrap.jpg
-%%DOCSDIR%%/html/index.html
-%%DOCSDIR%%/html/llvm.css
-%%DOCSDIR%%/html/tutorial/JITTutorial1.html
-%%DOCSDIR%%/html/tutorial/JITTutorial2.html
-%%DOCSDIR%%/html/tutorial/LangImpl1.html
-%%DOCSDIR%%/html/tutorial/LangImpl2.html
-%%DOCSDIR%%/html/tutorial/LangImpl3.html
-%%DOCSDIR%%/html/tutorial/LangImpl4.html
-%%DOCSDIR%%/html/tutorial/LangImpl5.html
-%%DOCSDIR%%/html/tutorial/LangImpl6.html
-%%DOCSDIR%%/html/tutorial/LangImpl7.html
-%%DOCSDIR%%/html/tutorial/LangImpl8.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl1.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl2.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl3.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl4.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl5.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl6.html
-%%DOCSDIR%%/html/tutorial/OCamlLangImpl7.html
-%%DOCSDIR%%/html/tutorial/index.html
-%%DOCSDIR%%/ps/bugpoint.ps
-%%DOCSDIR%%/ps/llc.ps
-%%DOCSDIR%%/ps/lli.ps
-%%DOCSDIR%%/ps/llvm-ar.ps
-%%DOCSDIR%%/ps/llvm-as.ps
-%%DOCSDIR%%/ps/llvm-bcanalyzer.ps
-%%DOCSDIR%%/ps/llvm-config.ps
-%%DOCSDIR%%/ps/llvm-db.ps
-%%DOCSDIR%%/ps/llvm-dis.ps
-%%DOCSDIR%%/ps/llvm-extract.ps
-%%DOCSDIR%%/ps/llvm-ld.ps
-%%DOCSDIR%%/ps/llvm-link.ps
-%%DOCSDIR%%/ps/llvm-nm.ps
-%%DOCSDIR%%/ps/llvm-prof.ps
-%%DOCSDIR%%/ps/llvm-ranlib.ps
-%%DOCSDIR%%/ps/llvmgcc.ps
-%%DOCSDIR%%/ps/llvmgxx.ps
-%%DOCSDIR%%/ps/opt.ps
-%%DOCSDIR%%/ps/stkrc.ps
-%%DOCSDIR%%/ps/tblgen.ps
+%%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
+%%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CFEBuildInstrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CodeGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CodingStandards.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/bugpoint.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/lli.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-as.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-bcanalyzer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-db.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-dis.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-extract.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ld.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-link.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-nm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-prof.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ranlib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmgcc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmgxx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/manpage.css
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/opt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/stkrc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/tblgen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CompilerDriver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ExceptionHandling.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ExtendingLLVM.html
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GCCFEBuildInstrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GarbageCollection.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GetElementPtr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GettingStarted.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GettingStartedVS.html
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToReleaseLLVM.html
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToSubmitABug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangRef.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.html
+%%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Passes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersManual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Projects.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/SourceLevelDebugging.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Stacker.html
+%%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html
+%%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/TestingGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsingLibraries.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WritingAnLLVMBackend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/WritingAnLLVMPass.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/img/Debugging.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/img/libdeps.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/img/lines.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/img/objdeps.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/img/venusflytrap.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm.css
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/JITTutorial1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/JITTutorial2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ps/bugpoint.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llc.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/lli.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ar.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-as.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-bcanalyzer.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-config.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-db.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-dis.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-extract.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ld.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-link.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-nm.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-prof.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ranlib.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvmgcc.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvmgxx.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/opt.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/stkrc.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/tblgen.ps
 @dirrm include/llvm/Transforms/Utils
 @dirrm include/llvm/Transforms/IPO
 @dirrm include/llvm/Transforms
@@ -453,9 +453,9 @@ lib/libLLVMipo.a
 @dirrm include/llvm-c/Transforms
 @dirrm include/llvm-c
 @dirrm include/llvm
-@dirrm %%DOCSDIR%%/ps
-@dirrm %%DOCSDIR%%/html/img
-@dirrm %%DOCSDIR%%/html/tutorial
-@dirrm %%DOCSDIR%%/html/CommandGuide
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/CommandGuide
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%