Index: head/security/clambc/Makefile
===================================================================
--- head/security/clambc/Makefile
+++ head/security/clambc/Makefile
@@ -14,27 +14,25 @@
 USES=		gmake libtool perl5
 ALL_TARGET=	clambc-only
 GNU_CONFIGURE=	yes
+CONFIGURE_OUTSOURCE=	yes
 USE_GCC=	any
 USE_LDCONFIG=	yes
 USE_PERL5=	build
-CONFIGURE_SCRIPT=../llvm/configure
+CONFIGURE_SCRIPT=llvm/configure
 CONFIGURE_ARGS=	--enable-optimized --enable-targets=host-only \
 		--disable-bindings --enable-bindings=none
 
-WRKSRC=		${WRKDIR}/clamav-bytecode-compiler-${DISTNAME}/obj
+WRKSRC=		${WRKDIR}/clamav-bytecode-compiler-${DISTNAME}
 
 MAKE_JOBS_UNSAFE=	yes
 
-post-extract:
-	@${MKDIR} ${WRKSRC}
-
 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} . \
+	@${RM} ${WRKSRC}/clang/lib/Headers/CMakeLists.txt \
+		${WRKSRC}/clang/lib/Headers/Makefile
+	(cd ${WRKSRC}/clang/lib/Headers/ && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DATADIR}/include/)
-	${INSTALL_PROGRAM} ${WRKSRC}/Release/bin/clambc-compiler \
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Release/bin/clambc-compiler \
 		${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
===================================================================
--- head/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
+++ head/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp
@@ -1,6 +1,6 @@
---- ../clang/lib/Driver/ToolChains.cpp~	2014-11-10 13:04:47.000000000 -0500
-+++ ../clang/lib/Driver/ToolChains.cpp	2014-11-18 12:24:07.772342155 -0500
-@@ -895,7 +895,7 @@
+--- 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) {
Index: head/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
===================================================================
--- head/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
+++ head/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
@@ -1,5 +1,5 @@
---- ../clang/lib/Frontend/CompilerInvocation.cpp.orig
-+++ ../clang/lib/Frontend/CompilerInvocation.cpp
+--- 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
  
Index: head/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
===================================================================
--- head/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
+++ head/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../clang/lib/Headers/CMakeLists.txt.orig
-+++ ../clang/lib/Headers/CMakeLists.txt
+--- 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)
Index: head/security/clambc/files/patch-clang_lib_Headers_Makefile
===================================================================
--- head/security/clambc/files/patch-clang_lib_Headers_Makefile
+++ head/security/clambc/files/patch-clang_lib_Headers_Makefile
@@ -1,5 +1,5 @@
---- ../clang/lib/Headers/Makefile.orig
-+++ ../clang/lib/Headers/Makefile
+--- 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)
Index: head/security/clambc/files/patch-clang_lib_Runtime_Makefile
===================================================================
--- head/security/clambc/files/patch-clang_lib_Runtime_Makefile
+++ head/security/clambc/files/patch-clang_lib_Runtime_Makefile
@@ -1,5 +1,5 @@
---- ../clang/lib/Runtime/Makefile.orig
-+++ ../clang/lib/Runtime/Makefile
+--- 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
  
Index: head/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
===================================================================
--- head/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
+++ head/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
@@ -1,5 +1,5 @@
---- ../clang/tools/CIndex/CIndexer.cpp.orig
-+++ ../clang/tools/CIndex/CIndexer.cpp
+--- 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
  
Index: head/security/clambc/files/patch-docs_user_building.tex
===================================================================
--- head/security/clambc/files/patch-docs_user_building.tex
+++ head/security/clambc/files/patch-docs_user_building.tex
@@ -1,5 +1,5 @@
---- ../docs/user/building.tex.orig
-+++ ../docs/user/building.tex
+--- 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:
Index: head/security/clambc/files/patch-docs_user_html_clambc-user.html
===================================================================
--- head/security/clambc/files/patch-docs_user_html_clambc-user.html
+++ head/security/clambc/files/patch-docs_user_html_clambc-user.html
@@ -1,5 +1,5 @@
---- ../docs/user/html/clambc-user.html.orig
-+++ ../docs/user/html/clambc-user.html
+--- 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>