Update to r6680.

5 files changed, 46 insertions, 39 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 89a31b772a1..e692aee3ee3 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -13,7 +13,8 @@ MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
 BUILD_DEPENDS=	bzr:devel/bzr \
-		${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:devel/bzrtools
+		${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:devel/bzrtools \
+		${LOCALBASE}/include/glm/glm.hpp:math/glm
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
diff --git a/cad/kicad-devel/Makefile.bzr_rev b/cad/kicad-devel/Makefile.bzr_rev
index fc57feebde2..5e2b9ba287e 100644
--- a/cad/kicad-devel/Makefile.bzr_rev
+++ b/cad/kicad-devel/Makefile.bzr_rev
@@ -1,4 +1,4 @@
 BOOST_RELEASE=  1.54.0
 BOOST_VERS=  1_54_0
-BZR_SRC_REV=  6329
+BZR_SRC_REV=  6680
 BZR_LIB_REV=  
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 5cd785689d2..e060bf62367 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad/kicad-r6329.tar.bz2) = 4ed6bf55ee2cf4ec2378562948c4f5a5fb0c96b304994ab411bbbe7409e2d619
-SIZE (kicad/kicad-r6329.tar.bz2) = 94212981
+SHA256 (kicad/kicad-r6680.tar.bz2) = 91e63f3c0c4470987e674157add071dff2664b23b408ad5ebe1ac1ae7f8aecdc
+SIZE (kicad/kicad-r6680.tar.bz2) = 91394239
diff --git a/cad/kicad-devel/files/patch-include-common.h b/cad/kicad-devel/files/patch-include-common.h
deleted file mode 100644
index 6a3aa545a64..00000000000
--- a/cad/kicad-devel/files/patch-include-common.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- include/common.h.orig	2015-04-19 12:57:35.742686441 +0000
-+++ include/common.h	2015-04-19 13:01:10.154899960 +0000
-@@ -56,5 +56,5 @@
-                                                      */
- #define GR_KB_CTRL       0x40000000                 // CTRL depressed
--#define GR_KB_ALT        0x80000000                 // ALT depressed
-+#define GR_KB_ALT        0x04000000                 // ALT depressed
- #define GR_KB_SHIFT      (GR_KB_LEFTSHIFT | GR_KB_RIGHTSHIFT)
- #define GR_KB_SHIFTCTRL  (GR_KB_SHIFT | GR_KB_CTRL)
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 2292f9fa29e..5b1cbb7a3fb 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -15,6 +15,8 @@ bin/kicad
 bin/pcb_calculator
 bin/pcbnew
 bin/pl_editor
+lib/kicad/plugins/3d/libs3d_plugin_idf.so
+lib/kicad/plugins/3d/libs3d_plugin_vrml.so
 lib/kicad/plugins/bom2csv.xsl
 lib/kicad/plugins/bom_cvs.xsl
 lib/kicad/plugins/bom_with_title_block_2_csv.xsl
@@ -22,8 +24,9 @@ lib/kicad/plugins/netlist_form_OrcadPcb2.xsl
 lib/kicad/plugins/netlist_form_cadstar-RINF.xsl
 lib/kicad/plugins/netlist_form_cadstar.xsl
 lib/kicad/plugins/netlist_form_pads-pcb.xsl
+lib/libkicad_3dsg.so
+lib/libkicad_3dsg.so.2.0.0
 %%DESKTOPDIR%%/bitmap2component.desktop
-%%DESKTOPDIR%%/cvpcb.desktop
 %%DESKTOPDIR%%/eeschema.desktop
 %%DESKTOPDIR%%/gerbview.desktop
 %%DESKTOPDIR%%/kicad.desktop
@@ -51,7 +54,6 @@ lib/kicad/plugins/netlist_form_pads-pcb.xsl
 %%PORTDOCS%%%%DOCSDIR%%/scripts/test_plugin.py
 share/icons/hicolor/128x128/apps/3d.png
 share/icons/hicolor/128x128/apps/bitmap2component.png
-share/icons/hicolor/128x128/apps/cvpcb.png
 share/icons/hicolor/128x128/apps/eeschema.png
 share/icons/hicolor/128x128/apps/gerbview.png
 share/icons/hicolor/128x128/apps/kicad.png
@@ -59,7 +61,6 @@ share/icons/hicolor/128x128/apps/pcbcalculator.png
 share/icons/hicolor/128x128/apps/pcbnew.png
 share/icons/hicolor/128x128/mimetypes/application-x-3d-project.png
 share/icons/hicolor/128x128/mimetypes/application-x-bitmap2component-project.png
-share/icons/hicolor/128x128/mimetypes/application-x-cvpcb-project.png
 share/icons/hicolor/128x128/mimetypes/application-x-eeschema-project.png
 share/icons/hicolor/128x128/mimetypes/application-x-gerbview-project.png
 share/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png
@@ -80,7 +81,6 @@ share/icons/hicolor/48x48/apps/kicad.png
 share/icons/hicolor/48x48/apps/pcbcalculator.png
 share/icons/hicolor/48x48/apps/pcbnew.png
 share/icons/hicolor/48x48/mimetypes/application-x-bitmap2component-project.png
-share/icons/hicolor/48x48/mimetypes/application-x-cvpcb-project.png
 share/icons/hicolor/48x48/mimetypes/application-x-eeschema-project.png
 share/icons/hicolor/48x48/mimetypes/application-x-gerbview-project.png
 share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png
@@ -88,7 +88,6 @@ share/icons/hicolor/48x48/mimetypes/application-x-pcbcalculator-project.png
 share/icons/hicolor/48x48/mimetypes/application-x-pcbnew-project.png
 share/icons/hicolor/scalable/apps/3d.svg
 share/icons/hicolor/scalable/apps/bitmap2component.svg
-share/icons/hicolor/scalable/apps/cvpcb.svg
 share/icons/hicolor/scalable/apps/eeschema.svg
 share/icons/hicolor/scalable/apps/gerbview.svg
 share/icons/hicolor/scalable/apps/kicad.svg
@@ -96,7 +95,6 @@ share/icons/hicolor/scalable/apps/pcbcalculator.svg
 share/icons/hicolor/scalable/apps/pcbnew.svg
 share/icons/hicolor/scalable/mimetypes/application-x-3d-project.svg
 share/icons/hicolor/scalable/mimetypes/application-x-bitmap2component-project.svg
-share/icons/hicolor/scalable/mimetypes/application-x-cvpcb-project.svg
 share/icons/hicolor/scalable/mimetypes/application-x-eeschema-project.svg
 share/icons/hicolor/scalable/mimetypes/application-x-gerbview-project.svg
 share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg
@@ -133,6 +131,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy_schlib.lib
 %%DATADIR%%/demos/flat_hierarchy/pic_programmer.sch
 %%DATADIR%%/demos/flat_hierarchy/pic_sockets.sch
+%%DATADIR%%/demos/interf_u/fp-lib-table
 %%DATADIR%%/demos/interf_u/image.lib
 %%DATADIR%%/demos/interf_u/image.mod
 %%DATADIR%%/demos/interf_u/interf_u-cache.lib
@@ -301,6 +300,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/library/Lattice.lib
 %%DATADIR%%/library/Oscillators.lib
 %%DATADIR%%/library/Power_Management.lib
+%%DATADIR%%/library/Worldsemi.dcm
+%%DATADIR%%/library/Worldsemi.lib
 %%DATADIR%%/library/Xicor.dcm
 %%DATADIR%%/library/Xicor.lib
 %%DATADIR%%/library/Zilog.dcm
@@ -319,6 +320,8 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/library/atmel.lib
 %%DATADIR%%/library/audio.dcm
 %%DATADIR%%/library/audio.lib
+%%DATADIR%%/library/bbd.dcm
+%%DATADIR%%/library/bbd.lib
 %%DATADIR%%/library/brooktre.dcm
 %%DATADIR%%/library/brooktre.lib
 %%DATADIR%%/library/cmos4000.dcm
@@ -1108,22 +1111,28 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/modules/packages3d/Connect.3dshapes/c64acfd.wrl
 %%DATADIR%%/modules/packages3d/Connect.3dshapes/he10-10d.wings
 %%DATADIR%%/modules/packages3d/Connect.3dshapes/he10-10d.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0210.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0210.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0310.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0310.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0410.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0410.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0510.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0510.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0610.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0610.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0710.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0710.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0810.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0810.wrl
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0910.wings
-%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0910.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0210.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0210.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0310.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0310.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0410.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0410.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0510.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0510.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0610.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0610.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0710.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0710.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0810.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0810.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0910.wings
+%%DATADIR%%/modules/packages3d/Connectors_Molex.3dshapes/Molex_PicoBlade_53047-0910.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_SMD_2520_4Pads.wings
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_SMD_2520_4Pads.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_SMD_5032_2Pads.step
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_SMD_5032_2Pads.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_SMD_5032_4Pads.wings
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_SMD_5032_4Pads.wrl
 %%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_Watch.wings
 %%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_Watch.wrl
 %%DATADIR%%/modules/packages3d/Crystals.3dshapes/HC-18UH.wings
@@ -1772,8 +1781,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/modules/packages3d/Inductors.3dshapes/self_cms_we-pd3.wrl
 %%DATADIR%%/modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wings
 %%DATADIR%%/modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wrl
-%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-0805.wings
-%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-0805.wrl
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-10MM.wings
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-10MM.wrl
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-3MM.wings
@@ -1784,6 +1791,16 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-5MM.wrl
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-8MM.wings
 %%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED-8MM.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0402.wings
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0402.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0603.wings
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0603.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0805.wings
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_0805.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_1206.wings
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_1206.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_WS2812-PLCC6.wrl
+%%DATADIR%%/modules/packages3d/LEDs.3dshapes/LED_WS2812B-PLCC4.wrl
 %%DATADIR%%/modules/packages3d/Measurement_Points.3dshapes/Test_Point.wrl
 %%DATADIR%%/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_1-1_P1200_ETAL.wings
 %%DATADIR%%/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_1-1_P1200_ETAL.wrl
@@ -4119,7 +4136,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/template/Arduino_Fio/meta/brd.png
 %%DATADIR%%/template/Arduino_Fio/meta/icon.png
 %%DATADIR%%/template/Arduino_Fio/meta/info.html
-%%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega-cache.dcm
 %%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega-cache.lib
 %%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.cmp
 %%DATADIR%%/template/Arduino_Mega_R3/Arduino_Mega.kicad_pcb
@@ -4166,7 +4182,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/template/Arduino_Mini/meta/brd.png
 %%DATADIR%%/template/Arduino_Mini/meta/icon.png
 %%DATADIR%%/template/Arduino_Mini/meta/info.html
-%%DATADIR%%/template/Arduino_Nano/Arduino_Nano-cache.dcm
 %%DATADIR%%/template/Arduino_Nano/Arduino_Nano-cache.lib
 %%DATADIR%%/template/Arduino_Nano/Arduino_Nano.cmp
 %%DATADIR%%/template/Arduino_Nano/Arduino_Nano.kicad_pcb