Remove static-analyzer option, moved into a separate package.

4 files changed, 3 insertions, 60 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index f5dab83fbbf..a2d4a4c4440 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2015/05/28 13:25:59 adam Exp $
+# $NetBSD: Makefile,v 1.41 2015/11/06 13:51:18 wiz Exp $
 
 MAKE_DIRS=		etc/llvm
 INSTALLATION_DIRS=	bin lib libexec
 
-.include "../../lang/clang/options.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../lang/clang/Makefile.common"
diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common
index 1dc546eab00..35bf7cc3fda 100644
--- a/lang/clang/Makefile.common
+++ b/lang/clang/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2015/09/26 08:42:19 tnn Exp $
+# $NetBSD: Makefile.common,v 1.10 2015/11/06 13:51:18 wiz Exp $
 #
 # used by lang/clang/Makefile
+# used by lang/clang-static-analyzer/Makefile
 # used by lang/libLLVM/Makefile
 # Keep in mind that the MesaLib package is also heavily reliant on libLLVM.
 # The mesa project tends to release new stable releases whenever clang is
diff --git a/lang/clang/PLIST.static-analyzer b/lang/clang/PLIST.static-analyzer
deleted file mode 100644
index 7ee70194bb6..00000000000
--- a/lang/clang/PLIST.static-analyzer
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST.static-analyzer,v 1.1 2014/10/01 09:41:02 wiz Exp $
-bin/scan-build
-bin/scan-view
-libexec/c++-analyzer
-libexec/ccc-analyzer
-man/man1/scan-build.1
-share/llvm/static-analyzer/Reporter.py
-share/llvm/static-analyzer/Resources/FileRadar.scpt
-share/llvm/static-analyzer/Resources/GetRadarVersion.scpt
-share/llvm/static-analyzer/Resources/bugcatcher.ico
-share/llvm/static-analyzer/ScanView.py
-share/llvm/static-analyzer/scan-view
-share/llvm/static-analyzer/scanview.css
-share/llvm/static-analyzer/sorttable.js
-share/llvm/static-analyzer/startfile.py
diff --git a/lang/clang/options.mk b/lang/clang/options.mk
deleted file mode 100644
index 774e75ec6cc..00000000000
--- a/lang/clang/options.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2015/04/03 11:06:57 tnn Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.clang
-PKG_SUPPORTED_OPTIONS=	clang-static-analyzer
-PKG_SUGGESTED_OPTIONS=	# clang-static-analyzer disabled since it needs python and perl
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_SRC=		${PLIST_SRC_DFLT}
-
-.if !empty(PKG_OPTIONS:Mclang-static-analyzer)
-PLIST_SRC+=		PLIST.static-analyzer
-
-INSTALLATION_DIRS+=	bin
-INSTALLATION_DIRS+=	libexec
-INSTALLATION_DIRS+=	${PKGMANDIR}/man1
-INSTALLATION_DIRS+=	share/llvm/static-analyzer
-INSTALLATION_DIRS+=	share/llvm/static-analyzer/Resources
-
-USE_TOOLS+=	perl:run
-REPLACE_PERL+=	tools/clang/tools/scan-build/c++-analyzer
-REPLACE_PERL+=	tools/clang/tools/scan-build/ccc-analyzer
-REPLACE_PERL+=	tools/clang/tools/scan-build/scan-build
-
-REPLACE_PYTHON+=		tools/clang/tools/scan-view/scan-view
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.5
-.include "../../lang/python/application.mk"
-
-post-build:
-	${ECHO} '#!/bin/sh' > ${WRKSRC}/scan-view
-	${ECHO} "${PREFIX}/share/llvm/static-analyzer/scan-view "'"$$@"' >> ${WRKSRC}/scan-view
-post-install:
-	cd ${WRKSRC}/tools/clang/tools/scan-build && \
-		${INSTALL_SCRIPT} scan-build ${DESTDIR}${PREFIX}/bin; \
-		${INSTALL_SCRIPT} c++-analyzer ccc-analyzer ${DESTDIR}${PREFIX}/libexec; \
-		${INSTALL_DATA} scan-build.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
-		${INSTALL_DATA} scanview.css sorttable.js ${DESTDIR}${PREFIX}/share/llvm/static-analyzer
-	cd ${WRKSRC}/tools/clang/tools/scan-view && \
-		${INSTALL_DATA} Resources/* ${DESTDIR}${PREFIX}/share/llvm/static-analyzer/Resources; \
-		${INSTALL_SCRIPT} scan-view *.py ${DESTDIR}${PREFIX}/share/llvm/static-analyzer
-	${INSTALL_SCRIPT} ${WRKSRC}/scan-view ${DESTDIR}${PREFIX}/bin
-.endif