5 files changed, 40 insertions, 28 deletions

diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index 19d0ea9062b3..f1ca0f7b8bb1 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  28a6ca1e23904b080ef34cf9bc1fed91d2191cc9
-GIT_SRC_DATE=  20170312170442
+GIT_SRC_HASH=  9fe780f1b3cd8a3d0d44a78c7381fae3add52b29
+GIT_SRC_DATE=  20170322171812
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 0e208d2cc9fa..33ae6b60a99b 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489401968
-SHA256 (kicad/kicad-r20170312170442.tar.bz2) = 50de7ddf1c4390afaa62c29ed7682bff32e55fbf48391900b55212e7067b6bd5
-SIZE (kicad/kicad-r20170312170442.tar.bz2) = 221885144
+TIMESTAMP = 1490205970
+SHA256 (kicad/kicad-r20170322171812.tar.bz2) = 80dc261521f5f5707fb853486c881a2da8a70cb7fb6fe8036e3e70763621e211
+SIZE (kicad/kicad-r20170322171812.tar.bz2) = 221779506
diff --git a/cad/kicad-devel/files/newVersion.sh b/cad/kicad-devel/files/newVersion.sh
index a2b1b105d802..aed75d987123 100644
--- a/cad/kicad-devel/files/newVersion.sh
+++ b/cad/kicad-devel/files/newVersion.sh
@@ -9,14 +9,14 @@ WRKDIR=`pwd`/work
 mkdir -p "${WRKDIR}"
 
 if [ \! -d "${CURDIR}/kicad-library" ]; then
- git clone https://github.com/KiCad/kicad-library.git "${CURDIR}/kicad-library";
+ git clone https://github.com/KiCad/kicad-library.git -b master "${CURDIR}/kicad-library";
 else
   cd "${CURDIR}/kicad-library"
   git pull;
 fi
 
 if [ \! -d "${CURDIR}/kicad-repo" ]; then
- git clone https://git.launchpad.net/kicad "${CURDIR}/kicad-repo";
+ git clone https://git.launchpad.net/kicad -b master "${CURDIR}/kicad-repo";
 else
   cd "${CURDIR}/kicad-repo"
   git pull https://git.launchpad.net/kicad;
diff --git a/cad/kicad-devel/files/patch-include-system-libcontext.h b/cad/kicad-devel/files/patch-include-system-libcontext.h
index 9c463548f313..29a678c0e4c7 100644
--- a/cad/kicad-devel/files/patch-include-system-libcontext.h
+++ b/cad/kicad-devel/files/patch-include-system-libcontext.h
@@ -1,21 +1,22 @@
---- include/system/libcontext.h.orig	2017-03-13 11:47:23.495919000 +0100
-+++ include/system/libcontext.h	2017-03-13 11:51:12.678651000 +0100
-@@ -23,13 +23,15 @@
- 
- 
--#if defined(__GNUC__) || defined(__APPLE__)
-+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)
- 
-     #define LIBCONTEXT_COMPILER_gcc
- 
--    #if defined(__linux__)
-+    #if defined(__linux__) || defined(__FreeBSD__)
- 	#ifdef __x86_64__
- 	    #define LIBCONTEXT_PLATFORM_linux_x86_64
- 	    #define LIBCONTEXT_CALL_CONVENTION
--
-+	#elif __amd64__
-+	    #define LIBCONTEXT_PLATFORM_linux_x86_64
-+	    #define LIBCONTEXT_CALL_CONVENTION
- 	#elif __i386__
- 	    #define LIBCONTEXT_PLATFORM_linux_i386
+---- include/system/libcontext.h.orig	2017-03-13 11:47:23.495919000 +0100
+-+++ include/system/libcontext.h	2017-03-13 11:51:12.678651000 +0100
+-@@ -23,13 +23,15 @@
+- 
+- 
+--#if defined(__GNUC__) || defined(__APPLE__)
+-+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)
+- 
+-     #define LIBCONTEXT_COMPILER_gcc
+- 
+--    #if defined(__linux__)
+-+    #if defined(__linux__) || defined(__FreeBSD__)
+- 	#ifdef __x86_64__
+- 	    #define LIBCONTEXT_PLATFORM_linux_x86_64
+- 	    #define LIBCONTEXT_CALL_CONVENTION
+--
+-+	#elif __amd64__
+-+	    #define LIBCONTEXT_PLATFORM_linux_x86_64
+-+	    #define LIBCONTEXT_CALL_CONVENTION
+- 	#elif __i386__
+- 	    #define LIBCONTEXT_PLATFORM_linux_i386
+
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 800222013455..22e28603efc8 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -338,12 +338,16 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/library/CMakeLists.txt
 %%DATADIR%%/library/ESD_Protection.dcm
 %%DATADIR%%/library/ESD_Protection.lib
+%%DATADIR%%/library/LEM.dcm
+%%DATADIR%%/library/LEM.lib
 %%DATADIR%%/library/Lattice.dcm
 %%DATADIR%%/library/Lattice.lib
 %%DATADIR%%/library/Oscillators.dcm
 %%DATADIR%%/library/Oscillators.lib
 %%DATADIR%%/library/Power_Management.dcm
 %%DATADIR%%/library/Power_Management.lib
+%%DATADIR%%/library/RFSolutions.dcm
+%%DATADIR%%/library/RFSolutions.lib
 %%DATADIR%%/library/Worldsemi.dcm
 %%DATADIR%%/library/Worldsemi.lib
 %%DATADIR%%/library/Xicor.dcm
@@ -3280,6 +3284,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX20_HX25_HallEffectCurrentTransducer.wrl
 %%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX50_HallEffectCurrentTransducer.wings
 %%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX50_HallEffectCurrentTransducer.wrl
+%%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/LEM_LA25-P.fcstd
+%%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/LEM_LA25-P.step
+%%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/LEM_LA25-P.wrl
+%%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/LEM_LV25-P.fcstd
+%%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/LEM_LV25-P.step
+%%DATADIR%%/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/LEM_LV25-P.wrl
 %%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/BGA-256_16x16_17.0x17.0mm_Pitch1.0mm.wings
 %%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/BGA-256_16x16_17.0x17.0mm_Pitch1.0mm.wrl
 %%DATADIR%%/modules/packages3d/Housings_BGA.3dshapes/BGA-352_26x26_35.0x35.0mm_Pitch1.27mm.wings
@@ -6142,6 +6152,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/modules/packages3d/Valves.3dshapes/VALVE-ECC-83-2.wings
 %%DATADIR%%/modules/packages3d/Valves.3dshapes/VALVE-ECC-83-2.wrl
 %%DATADIR%%/modules/packages3d/Valves.3dshapes/VALVE-MINI_PENTODE_LINEAR.FCStd
+%%DATADIR%%/modules/packages3d/Valves.3dshapes/VALVE-MINI_PENTODE_LINEAR.step
 %%DATADIR%%/modules/packages3d/Valves.3dshapes/VALVE-MINI_PENTODE_LINEAR.wrl
 %%DATADIR%%/template/1593K_Enclosure/1593K_Enclosure.kicad_pcb
 %%DATADIR%%/template/1593K_Enclosure/1593K_Enclosure.net