--- a/components/libffi/libffi.p5m	Fri Nov 18 08:49:15 2016 -0800
+++ b/components/libffi/libffi.p5m	Fri Nov 18 13:15:14 2016 -0800
@@ -35,14 +35,16 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/542
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/include/ffi.h
-file path=usr/include/ffitarget.h
+file path=usr/lib/$(MACH64)/libffi-$(COMPONENT_VERSION)/include/ffi.h
+file path=usr/lib/$(MACH64)/libffi-$(COMPONENT_VERSION)/include/ffitarget.h
 link path=usr/lib/$(MACH64)/libffi.so target=libffi.so.6.0.4
 link path=usr/lib/$(MACH64)/libffi.so.5 target=libffi.so.6
 link path=usr/lib/$(MACH64)/libffi.so.5.0.10 target=libffi.so.6.0.4
 link path=usr/lib/$(MACH64)/libffi.so.6 target=libffi.so.6.0.4
 file path=usr/lib/$(MACH64)/libffi.so.6.0.4
 file path=usr/lib/$(MACH64)/pkgconfig/libffi.pc
+file path=usr/lib/libffi-$(COMPONENT_VERSION)/include/ffi.h
+file path=usr/lib/libffi-$(COMPONENT_VERSION)/include/ffitarget.h
 link path=usr/lib/libffi.so target=libffi.so.6.0.4
 link path=usr/lib/libffi.so.5 target=libffi.so.6
 link path=usr/lib/libffi.so.5.0.10 target=libffi.so.6.0.4
@@ -52,4 +54,5 @@
 file path=usr/share/man/man3/ffi.3
 file path=usr/share/man/man3/ffi_call.3
 file path=usr/share/man/man3/ffi_prep_cif.3
+file path=usr/share/man/man3/ffi_prep_cif_var.3
 license LICENSE license=MIT

--- a/components/libffi/patches/Makefile_in.patch	Fri Nov 18 08:49:15 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# Header files go in /usr/include. Will attempt to send upstream.
-# There is no way to configure to change the include path, as 
-# --prefix does not work, so a patch is required.
-# Changed the pkg-config --cflags to point to the right directory
---- libffi-3.2.1/include/Makefile.in_orig	2016-10-17 15:20:14.202082552 +0000
-+++ libffi-3.2.1/include/Makefile.in	2016-10-17 15:20:51.157615614 +0000
-@@ -314,7 +314,7 @@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = @includedir@
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
- 
---- libffi-3.2.1/libffi.pc.in_orig	2016-10-17 15:25:16.243588940 +0000
-+++ libffi-3.2.1/libffi.pc.in	2016-10-17 15:25:28.673730084 +0000
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- toolexeclibdir=@toolexeclibdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces

--- a/components/llvm/Makefile	Fri Nov 18 08:49:15 2016 -0800
+++ b/components/llvm/Makefile	Fri Nov 18 13:15:14 2016 -0800
@@ -369,8 +369,8 @@
 LLVM_LIBEXECDIR_64 = /usr/libexec/$(MACH64)
 LLVM_LIBEXECDIR = $(LLVM_LIBEXECDIR_$(BITS))
 
-LIBFFI_INCDIR_32 = /usr/lib/libffi-3.0.9/include
-LIBFFI_INCDIR_64 = /usr/lib/$(MACH64)/libffi-3.0.9/include
+LIBFFI_INCDIR_32 = $(shell pkg-config --cflags libffi | sed -e s,-I,,)
+LIBFFI_INCDIR_64 = $(shell env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH.64) pkg-config --cflags libffi | sed -e s,-I,,)
 LIBFFI_INCDIR = $(LIBFFI_INCDIR_$(BITS))
 
 LIBFFI_LIBDIR_32 = /usr/lib