Index: head/security/clambc/Makefile
===================================================================
--- head/security/clambc/Makefile	(revision 413195)
+++ head/security/clambc/Makefile	(revision 413196)
@@ -1,40 +1,38 @@
 # Created by: Ryan Steinmetz <zi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	clambc
 DISTVERSION=	0.98.5rc1
 CATEGORIES=	security
 MASTER_SITES=	SF/clamav/${PORTNAME:tl}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Bytecode signature compiler for ClamAV
 
 LICENSE=	GPLv2
 
 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	(revision 413195)
+++ head/security/clambc/files/patch-clang_lib_Driver_ToolChains.cpp	(revision 413196)
@@ -1,11 +1,11 @@
---- ../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) {
 -  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/");
  
Index: head/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp
===================================================================
--- head/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp	(revision 413195)
+++ head/security/clambc/files/patch-clang_lib_Frontend_CompilerInvocation.cpp	(revision 413196)
@@ -1,14 +1,14 @@
---- ../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
  
      // 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();
Index: head/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt
===================================================================
--- head/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt	(revision 413195)
+++ head/security/clambc/files/patch-clang_lib_Headers_CMakeLists.txt	(revision 413196)
@@ -1,11 +1,11 @@
---- ../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)
  else ()
 -  set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include)
 +  set(output_dir ${LLVM_BINARY_DIR}/share/clambc)
  endif ()
  
  
Index: head/security/clambc/files/patch-clang_lib_Headers_Makefile
===================================================================
--- head/security/clambc/files/patch-clang_lib_Headers_Makefile	(revision 413195)
+++ head/security/clambc/files/patch-clang_lib_Headers_Makefile	(revision 413196)
@@ -1,20 +1,20 @@
---- ../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)
  
 -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))
  
Index: head/security/clambc/files/patch-clang_lib_Runtime_Makefile
===================================================================
--- head/security/clambc/files/patch-clang_lib_Runtime_Makefile	(revision 413195)
+++ head/security/clambc/files/patch-clang_lib_Runtime_Makefile	(revision 413196)
@@ -1,13 +1,13 @@
---- ../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
  
  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
Index: head/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp
===================================================================
--- head/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp	(revision 413195)
+++ head/security/clambc/files/patch-clang_tools_CIndex_CIndexer.cpp	(revision 413196)
@@ -1,14 +1,14 @@
---- ../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
  
      // 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();
Index: head/security/clambc/files/patch-docs_user_building.tex
===================================================================
--- head/security/clambc/files/patch-docs_user_building.tex	(revision 413195)
+++ head/security/clambc/files/patch-docs_user_building.tex	(revision 413196)
@@ -1,20 +1,20 @@
---- ../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:
  \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
Index: head/security/clambc/files/patch-docs_user_html_clambc-user.html
===================================================================
--- head/security/clambc/files/patch-docs_user_html_clambc-user.html	(revision 413195)
+++ head/security/clambc/files/patch-docs_user_html_clambc-user.html	(revision 413196)
@@ -1,11 +1,11 @@
---- ../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>
  
                                                                                  
       <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