14 files changed, 1 insertions, 194 deletions

diff --git a/MOVED b/MOVED
index 8b5a098d99f4..2517527cd5b1 100644
--- a/MOVED
+++ b/MOVED
@@ -9543,3 +9543,4 @@ databases/py33-sqlite3||2017-09-03|Removed, please update to Python 3.6
 devel/py33-setuptools||2017-09-03|Removed, please update to Python 3.6
 x11-toolkits/py33-tkinter||2017-09-03|Removed, please update to Python 3.6
 devel/py3-enum34||2017-09-03|Removed, Python 3.3 only
+security/clambc||2017-09-14|Has expired: Practically unmaintained, featuring issues elsewhere solved 6 years ago
diff --git a/security/Makefile b/security/Makefile
index f9384f9536db..9b6c542ebd18 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -80,7 +80,6 @@
     SUBDIR += clamav
     SUBDIR += clamav-milter
     SUBDIR += clamav-unofficial-sigs
-    SUBDIR += clambc
     SUBDIR += clamcour
     SUBDIR += clamd-stream-client
     SUBDIR += clamfs
diff --git a/security/clambc/Makefile b/security/clambc/Makefile
deleted file mode 100644
index f3cb73208655..000000000000
--- a/security/clambc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	clambc
-DISTVERSION=	0.98.5rc1
-PORTREVISION=	4
-CATEGORIES=	security
-MASTER_SITES=	SF/clamav/${PORTNAME:tl}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Bytecode signature compiler for ClamAV
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Practically unmaintained, featuring issues elsewhere solved 6 years ago
-EXPIRATION_DATE=2017-09-13
-
-NOT_FOR_ARCHS=		aarch64
-NOT_FOR_ARCHS_REASON=	fails to configure: error: Can not set target to build
-
-USES=		gmake libtool perl5
-ALL_TARGET=	clambc-only
-GNU_CONFIGURE=	yes
-CONFIGURE_OUTSOURCE=	yes
-USE_GCC=	5	# fails to build with GCC 6+
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-CONFIGURE_SCRIPT=llvm/configure
-CONFIGURE_ARGS=	--enable-optimized --enable-targets=host-only \
-		--disable-bindings --enable-bindings=none
-
-WRKSRC=		${WRKDIR}/clamav-bytecode-compiler-${DISTNAME}
-
-MAKE_JOBS_UNSAFE=	yes
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/include/
-	@${RM} ${WRKSRC}/clang/lib/Headers/CMakeLists.txt \
-		${WRKSRC}/clang/lib/Headers/Makefile
-	(cd ${WRKSRC}/clang/lib/Headers/ && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${DATADIR}/include/)
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Release/bin/clambc-compiler \
-		${STAGEDIR}${PREFIX}/bin/
-
-.include <bsd.port.mk>
diff --git a/security/clambc/distinfo b/security/clambc/distinfo
deleted file mode 100644
index 0a3783083498..000000000000
--- a/security/clambc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (clambc-0.98.5rc1.tar.gz) = bed439949f4259791c80d069ea58c97637bdfaefe352dd0d8f27eb9e2df9b491
-SIZE (clambc-0.98.5rc1.tar.gz) = 17867376
diff --git a/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp b/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
deleted file mode 100644
index 9aac0d7c3f9e..000000000000
--- a/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- clang/lib/Driver/ToolChains.cpp.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Driver/ToolChains.cpp
-@@ -895,7 +895,7 @@ Tool &AuroraUX::SelectTool(const Compila
- 
- Linux::Linux(const HostInfo &Host, const llvm::Triple& Triple)
-   : Generic_GCC(Host, Triple) {
--  getFilePaths().push_back(getDriver().Dir + "/../lib/clang/1.0/");
-+  getFilePaths().push_back(getDriver().Dir + "/../share/clambc/");
-   getFilePaths().push_back("/lib/");
-   getFilePaths().push_back("/usr/lib/");
- 
diff --git a/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp b/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
deleted file mode 100644
index 6e1dbfa85c82..000000000000
--- a/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- clang/lib/Frontend/CompilerInvocation.cpp.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Frontend/CompilerInvocation.cpp
-@@ -993,9 +993,8 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
-     P.eraseComponent();  // Remove /bin   from foo/bin
- 
-     // Get foo/lib/clang/<version>/include
--    P.appendComponent("lib");
--    P.appendComponent("clang");
--    P.appendComponent(CLANG_VERSION_STRING);
-+    P.appendComponent("share");
-+    P.appendComponent("clambc");
-   }
- 
-   return P.str();
diff --git a/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt b/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
deleted file mode 100644
index fedd33c13121..000000000000
--- a/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- clang/lib/Headers/CMakeLists.txt.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Headers/CMakeLists.txt
-@@ -17,7 +17,7 @@ set(files
- if (MSVC_IDE OR XCODE)
-   set(output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include)
- else ()
--  set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include)
-+  set(output_dir ${LLVM_BINARY_DIR}/share/clambc)
- endif ()
- 
- 
diff --git a/security/clambc/files/patch-clang_lib_Headers_Makefile b/security/clambc/files/patch-clang_lib_Headers_Makefile
deleted file mode 100644
index 7947f673f196..000000000000
--- a/security/clambc/files/patch-clang_lib_Headers_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- clang/lib/Headers/Makefile.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Headers/Makefile
-@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.common
- 
- CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
- 
--HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-+HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/share/clambc
- 
- HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
- 
-@@ -26,7 +26,7 @@ $(OBJHEADERS): $(HeaderDir)/%.h: $(PROJ_SRC_DIR)/%.h $(HeaderDir)/.dir
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS)
- 
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/share/clambc
- 
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- 
diff --git a/security/clambc/files/patch-clang_lib_Runtime_Makefile b/security/clambc/files/patch-clang_lib_Runtime_Makefile
deleted file mode 100644
index 3f5fe559e68b..000000000000
--- a/security/clambc/files/patch-clang_lib_Runtime_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- clang/lib/Runtime/Makefile.orig	2014-11-10 18:04:47 UTC
-+++ clang/lib/Runtime/Makefile
-@@ -17,8 +17,8 @@ LEVEL = ../../../..
- include $(LEVEL)/Makefile.common
- 
- CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
--ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/share/clambc
-+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/share/clambc
- 
- ResourceLibDir := $(ResourceDir)/lib
- PROJ_resources_lib := $(PROJ_resources)/lib
diff --git a/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp b/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
deleted file mode 100644
index 9bee7ff31d2a..000000000000
--- a/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- clang/tools/CIndex/CIndexer.cpp.orig	2014-11-10 18:04:47 UTC
-+++ clang/tools/CIndex/CIndexer.cpp
-@@ -87,9 +87,8 @@ std::string CIndexer::getClangResourcesPath() {
-     P.eraseComponent();  // Remove /bin   from foo/bin
- 
-     // Get foo/lib/clang/<version>/include
--    P.appendComponent("lib");
--    P.appendComponent("clang");
--    P.appendComponent(CLANG_VERSION_STRING);
-+    P.appendComponent("local");
-+    P.appendComponent("clambc");
-   }
- 
-   return P.str();
diff --git a/security/clambc/files/patch-docs_user_building.tex b/security/clambc/files/patch-docs_user_building.tex
deleted file mode 100644
index a4910b66b94a..000000000000
--- a/security/clambc/files/patch-docs_user_building.tex
+++ /dev/null
@@ -1,20 +0,0 @@
---- docs/user/building.tex.orig	2014-11-10 18:04:47 UTC
-+++ docs/user/building.tex
-@@ -96,7 +96,7 @@ $ make install-clambc -j8
- \verb+$PREFIX/bin/clambc-compiler+
- \item  ClamAV bytecode header files:
- \begin{verbatim}
--$PREFIX/lib/clang/1.1/include:
-+$PREFIX/share/clambc:
- bcfeatures.h
- bytecode_{api_decl.c,api,disasm,execs,features}.h
- bytecode.h
-@@ -104,7 +104,7 @@ bytecode_{local,pe,types}.h
- \end{verbatim}
- \item clang compiler (with ClamAV bytecode backend) compiler include files:
- \begin{verbatim}
--$PREFIX/lib/clang/1.1/include:
-+$PREFIX/share/clambc:
- emmintrin.h
- float.h
- iso646.h
diff --git a/security/clambc/files/patch-docs_user_html_clambc-user.html b/security/clambc/files/patch-docs_user_html_clambc-user.html
deleted file mode 100644
index 2ac586504795..000000000000
--- a/security/clambc/files/patch-docs_user_html_clambc-user.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/user/html/clambc-user.html.orig	2014-11-10 18:04:47 UTC
-+++ docs/user/html/clambc-user.html
-@@ -233,7 +233,7 @@ class="ec-lmtt-10">$PREFIX/bin/clambc-compiler</span></span></span>
- 
-                                                                                 
-      <div class="verbatim" id="verbatim-5">
--     $PREFIX/lib/clang/1.1/include:
-+     $PREFIX/share/clambc:
-      &#x00A0;<br />bcfeatures.h
-      &#x00A0;<br />bytecode_{api_decl.c,api,disasm,execs,features}.h
-      &#x00A0;<br />bytecode.h
diff --git a/security/clambc/pkg-descr b/security/clambc/pkg-descr
deleted file mode 100644
index 4c14fdd82185..000000000000
--- a/security/clambc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The ClamAV bytecode compiler allows users to build their own bytecode
-signatures for use with ClamAV.
-
-WWW: https://www.clamav.net/
diff --git a/security/clambc/pkg-plist b/security/clambc/pkg-plist
deleted file mode 100644
index b7a3f2fd13dc..000000000000
--- a/security/clambc/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/clambc-compiler
-%%DATADIR%%/include/bcfeatures.h
-%%DATADIR%%/include/bytecode.h
-%%DATADIR%%/include/bytecode_api.h
-%%DATADIR%%/include/bytecode_api_decl.c.h
-%%DATADIR%%/include/bytecode_detect.h
-%%DATADIR%%/include/bytecode_disasm.h
-%%DATADIR%%/include/bytecode_execs.h
-%%DATADIR%%/include/bytecode_features.h
-%%DATADIR%%/include/bytecode_ilog.h
-%%DATADIR%%/include/bytecode_local.h
-%%DATADIR%%/include/bytecode_pe.h
-%%DATADIR%%/include/bytecode_types.h
-%%DATADIR%%/include/emmintrin.h
-%%DATADIR%%/include/float.h
-%%DATADIR%%/include/iso646.h
-%%DATADIR%%/include/limits.h
-%%DATADIR%%/include/mm_malloc.h
-%%DATADIR%%/include/mmintrin.h
-%%DATADIR%%/include/pmmintrin.h
-%%DATADIR%%/include/smmintrin.h
-%%DATADIR%%/include/stdarg.h
-%%DATADIR%%/include/stdbool.h
-%%DATADIR%%/include/stddef.h
-%%DATADIR%%/include/stdint.h
-%%DATADIR%%/include/tgmath.h
-%%DATADIR%%/include/tmmintrin.h
-%%DATADIR%%/include/xmmintrin.h