From ad9c863648a8b22df64034e5bc8c7bb50f146f3a Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Fri, 10 Dec 2010 15:09:00 +0000
Subject: Rather than relying on some hackish patches use thre --disable-docs
 configure option in the NOPORTDOCS case.

This should result in no changes to packages.
---
 lang/clang-devel/Makefile                         |  6 +-----
 lang/clang-devel/files/patch-Makefile             | 14 --------------
 lang/clang-devel/files/patch-tools_clang_Makefile | 14 --------------
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 lang/clang-devel/files/patch-Makefile
 delete mode 100644 lang/clang-devel/files/patch-tools_clang_Makefile

(limited to 'lang/clang-devel')

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 714ad322cfdd..0439f2c2a440 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -58,9 +58,7 @@ CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
 .if defined(NOPORTDOCS)
-DOCSRCDIR=
-.else
-DOCSRCDIR=	docs
+CONFIGURE_ARGS+=	--disable-docs
 .endif
 
 MAN1=		clang.1
@@ -97,8 +95,6 @@ post-patch:
 	    ${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 ${WRKSRC}/tools/clang/Makefile
 	${REINPLACE_CMD} -e 's|/usr/bin/env perl|${PERL}|' \
 	    -e 's|%%DATADIR%%|${DATADIR}|' \
 	    ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
diff --git a/lang/clang-devel/files/patch-Makefile b/lang/clang-devel/files/patch-Makefile
deleted file mode 100644
index d056dceae2e2..000000000000
--- a/lang/clang-devel/files/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -31,7 +31,7 @@
-   OPTIONAL_DIRS :=
- else
-   DIRS := lib/Support utils lib/VMCore lib tools/llvm-shlib \
--          tools/llvm-config tools runtime docs unittests
-+          tools/llvm-config tools runtime %%DOCSRCDIR%% unittests
-   OPTIONAL_DIRS := projects bindings
- endif
- 
diff --git a/lang/clang-devel/files/patch-tools_clang_Makefile b/lang/clang-devel/files/patch-tools_clang_Makefile
deleted file mode 100644
index 331b1a29c15e..000000000000
--- a/lang/clang-devel/files/patch-tools_clang_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/Makefile.orig
-+++ tools/clang/Makefile
-@@ -14,7 +14,7 @@
- 
- IS_TOP_LEVEL := 1
- CLANG_LEVEL := .
--DIRS := include lib tools runtime docs
-+DIRS := include lib tools runtime %%DOCSRCDIR%%
- 
- PARALLEL_DIRS :=
- 
-- 
cgit