Update kicad to the 4.0.1 release.

Major changes:
    New graphics rendering backend GAL (OpenGL and Cairo) [currently pcbnew
	only and does not yet support all legacy tools]

    New s-expression based pcb format (.kicad_pcb)

    New footprint library format (.pretty folder with .kicad_mod footprints)

    Updated footprint editor (only usable with GAL renderer)

    More advanced footprint manager concept called footprint library
	table (fp-lib-table)

    Ability to download footprints on the fly from git repositories

    Official libraries are now stored on github and regularly updated

    Awesome/Advanced Push and Shove (PnS) router (only usable with GAL renderer)

    Interactive differential trace routing and tuning

    Interactive trace length tuning

    Much more realistic 3D board rendering

    Intelligent library search with preview in Eeschema

    Initial Python api for Pcbnew

Notes:
Symbols have changed size, been renamed, etc to follow the new KiCad library
conventions so you need to take care when working with older schematics if
you used the symbols packaged with KiCad.

The new pcb format cannot be loaded in older versions of KiCad.

33 files changed, 683 insertions, 666 deletions

diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 4f7e8321e84..af188328a07 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 14:20:27 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/03 19:34:33 bouyer Exp $
 #
 
-V=		20140214
-DISTNAME=	kicad-stable-${V}
-PKGNAME=	kicad-${V}
-PKGREVISION=	5
+V=		4.0.1
+DISTNAME=	kicad-${V}
 CATEGORIES=	cad
-MASTER_SITES=	http://ftp.fr.NetBSD.org/~bouyer/kicad/
+MASTER_SITES=	https://launchpad.net/kicad/4.0/${V}/+download/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.kicad-pcb.org/
@@ -17,8 +16,8 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_CMAKE=		yes
 
-CMAKE_ARGS+=		-DKICAD_STABLE_VERSION=ON
-CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V}
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON
 
 CMAKE_MODULE_PATH_OVERRIDE = \
 			bitmaps_png/CMakeLists.txt \
@@ -28,13 +27,13 @@ CMAKE_MODULE_PATH_OVERRIDE = \
 SUBST_CLASSES+=		macosx
 SUBST_STAGE.macosx=	pre-configure
 SUBST_MESSAGE.macosx=	Eliminating Mac OS X build specific for ${PKGNAME}
-SUBST_FILES.macosx=	bitmap2component/CMakeLists.txt			\
-			eeschema/CMakeLists.txt				\
-			cvpcb/CMakeLists.txt				\
-			gerbview/CMakeLists.txt				\
-			kicad/CMakeLists.txt				\
-			pcb_calculator/CMakeLists.txt			\
-			pcbnew/CMakeLists.txt
+SUBST_FILES.macosx=	cvpcb/CMakeLists.txt \
+			eeschema/CMakeLists.txt \
+			gerbview/CMakeLists.txt \
+			kicad/CMakeLists.txt \
+			pagelayout_editor/CMakeLists.txt \
+			pcbnew/CMakeLists.txt \
+			pcb_calculator/CMakeLists.txt
 SUBST_SED.macosx=	-e 's/[[:<:]]MACOSX_BUNDLE[[:>:]]//'
 
 .include "../../mk/bsd.prefs.mk"
@@ -49,11 +48,14 @@ SUBST_FILES.netbsd5=	pcbnew/legacy_plugin.cpp        \
 SUBST_SED.netbsd5=	-e 's/fabsl/fabs/g'
 .endif
 
+.include "../../devel/swig/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cmake/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/cad/kicad/PLIST b/cad/kicad/PLIST
index 6b9839d73c4..32709e212f6 100644
--- a/cad/kicad/PLIST
+++ b/cad/kicad/PLIST
@@ -1,59 +1,137 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/02/03 19:34:33 bouyer Exp $
+bin/_cvpcb.kiface
+bin/_eeschema.kiface
+bin/_gerbview.kiface
+bin/_pcb_calculator.kiface
+bin/_pcbnew.kiface
+bin/_pl_editor.kiface
 bin/bitmap2component
-bin/cvpcb
+bin/dxf2idf
 bin/eeschema
-bin/freeroute.jnlp
 bin/gerbview
+bin/idf2vrml
+bin/idfcyl
+bin/idfrect
 bin/kicad
 bin/pcb_calculator
 bin/pcbnew
+bin/pl_editor
+lib/kicad/plugins/bom2csv.xsl
+lib/kicad/plugins/bom_cvs.xsl
+lib/kicad/plugins/bom_with_title_block_2_csv.xsl
+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
+share/applications/bitmap2component.desktop
+share/applications/cvpcb.desktop
 share/applications/eeschema.desktop
+share/applications/gerbview.desktop
 share/applications/kicad.desktop
+share/applications/pcbcalculator.desktop
+share/applications/pcbnew.desktop
 share/doc/kicad/INSTALL.txt
-share/doc/kicad/scripts/bom-in-python/ky/bom_example1.py
-share/doc/kicad/scripts/bom-in-python/ky/bom_example2.py
-share/doc/kicad/scripts/bom-in-python/ky/bom_example3.py
-share/doc/kicad/scripts/bom-in-python/ky/bom_example4.py
-share/doc/kicad/scripts/bom-in-python/ky/bom_example5.py
-share/doc/kicad/scripts/bom-in-python/ky/ky.py
-share/doc/kicad/scripts/bom-in-python/ky/round_robin.py
-share/doc/kicad/scripts/bom-in-python/ky/round_value_robin.py
-share/doc/kicad/scripts/kicad-get-rss
+share/doc/kicad/scripts/bom-in-python/README-bom.txt
+share/doc/kicad/scripts/bom-in-python/bom_csv_grouped_by_value.py
+share/doc/kicad/scripts/bom-in-python/bom_csv_grouped_by_value_with_fp.py
+share/doc/kicad/scripts/bom-in-python/bom_csv_sorted_by_ref.py
+share/doc/kicad/scripts/bom-in-python/bom_html_by_value.py
+share/doc/kicad/scripts/bom-in-python/bom_html_grouped_by_value.py
+share/doc/kicad/scripts/bom-in-python/bom_html_with_advanced_grouping.py
+share/doc/kicad/scripts/bom-in-python/bom_sorted_by_ref.py
+share/doc/kicad/scripts/bom-in-python/kicad_netlist_reader.py
+share/doc/kicad/scripts/bom-in-python/round_robin.py
+share/doc/kicad/scripts/bom-in-python/round_value_robin.py
+share/doc/kicad/scripts/kicad-install.sh
+share/doc/kicad/scripts/lib_convert.py
+share/doc/kicad/scripts/library-repos-install.bat
+share/doc/kicad/scripts/library-repos-install.sh
+share/doc/kicad/scripts/osx_build_wx.sh
+share/doc/kicad/scripts/osx_fixbundle.sh
+share/doc/kicad/scripts/test_kicad_plugin.py
+share/doc/kicad/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
+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
+share/icons/hicolor/128x128/mimetypes/application-x-pcbcalculator-project.png
+share/icons/hicolor/128x128/mimetypes/application-x-pcbnew-project.png
 share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/22x22/apps/kicad.png
 share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/24x24/apps/kicad.png
 share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/32x32/apps/kicad.png
 share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/48x48/apps/bitmap2component.png
+share/icons/hicolor/48x48/apps/cvpcb.png
+share/icons/hicolor/48x48/apps/eeschema.png
+share/icons/hicolor/48x48/apps/gerbview.png
 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
+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
+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
+share/icons/hicolor/scalable/mimetypes/application-x-pcbcalculator-project.svg
+share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 share/kicad/demos/complex_hierarchy/ampli_ht.sch
 share/kicad/demos/complex_hierarchy/complex_hierarchy-cache.lib
-share/kicad/demos/complex_hierarchy/complex_hierarchy.cmp
 share/kicad/demos/complex_hierarchy/complex_hierarchy.kicad_pcb
 share/kicad/demos/complex_hierarchy/complex_hierarchy.net
 share/kicad/demos/complex_hierarchy/complex_hierarchy.pro
 share/kicad/demos/complex_hierarchy/complex_hierarchy.sch
+share/kicad/demos/complex_hierarchy/complex_hierarchy_schlib.lib
 share/kicad/demos/ecc83/ecc83-pp-cache.lib
-share/kicad/demos/ecc83/ecc83-pp.cmp
 share/kicad/demos/ecc83/ecc83-pp.kicad_pcb
 share/kicad/demos/ecc83/ecc83-pp.net
 share/kicad/demos/ecc83/ecc83-pp.pro
 share/kicad/demos/ecc83/ecc83-pp.sch
 share/kicad/demos/ecc83/ecc83-pp_v2-cache.lib
 share/kicad/demos/ecc83/ecc83-pp_v2.kicad_pcb
+share/kicad/demos/ecc83/ecc83-pp_v2.net
 share/kicad/demos/ecc83/ecc83-pp_v2.pro
 share/kicad/demos/ecc83/ecc83-pp_v2.sch
+share/kicad/demos/ecc83/ecc83_schlib.dcm
+share/kicad/demos/ecc83/ecc83_schlib.lib
+share/kicad/demos/ecc83/fp-lib-table
 share/kicad/demos/electric/electric-cache.lib
 share/kicad/demos/electric/electric.pro
 share/kicad/demos/electric/electric.sch
 share/kicad/demos/flat_hierarchy/flat_hierarchy-cache.lib
-share/kicad/demos/flat_hierarchy/flat_hierarchy.cmp
 share/kicad/demos/flat_hierarchy/flat_hierarchy.kicad_pcb
 share/kicad/demos/flat_hierarchy/flat_hierarchy.net
 share/kicad/demos/flat_hierarchy/flat_hierarchy.pro
 share/kicad/demos/flat_hierarchy/flat_hierarchy.sch
+share/kicad/demos/flat_hierarchy/flat_hierarchy_schlib.lib
 share/kicad/demos/flat_hierarchy/pic_programmer.sch
 share/kicad/demos/flat_hierarchy/pic_sockets.sch
 share/kicad/demos/interf_u/image.lib
@@ -64,21 +142,28 @@ share/kicad/demos/interf_u/interf_u.kicad_pcb
 share/kicad/demos/interf_u/interf_u.net
 share/kicad/demos/interf_u/interf_u.pro
 share/kicad/demos/interf_u/interf_u.sch
+share/kicad/demos/interf_u/interf_u_schlib.lib
+share/kicad/demos/interf_u/pagelayout_logo.kicad_wks
 share/kicad/demos/interf_u/tux.bmp
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
-share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.dcm
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib
-share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.net
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/dpack_5.wings
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/dpack_5.wrl
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wrl
 share/kicad/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
 share/kicad/demos/microwave/microwave.kicad_pcb
 share/kicad/demos/microwave/microwave.pro
 share/kicad/demos/microwave/shape1.txt
+share/kicad/demos/pic_programmer/fp-lib-table
+share/kicad/demos/pic_programmer/libs/pic_programmer_fp.pretty/1pin-4.kicad_mod
+share/kicad/demos/pic_programmer/libs/pic_programmer_schlib.lib
 share/kicad/demos/pic_programmer/pic_programmer-cache.lib
-share/kicad/demos/pic_programmer/pic_programmer.cmp
 share/kicad/demos/pic_programmer/pic_programmer.kicad_pcb
 share/kicad/demos/pic_programmer/pic_programmer.net
 share/kicad/demos/pic_programmer/pic_programmer.pro
@@ -88,78 +173,50 @@ share/kicad/demos/pspice/pspice-cache.lib
 share/kicad/demos/pspice/pspice.cir
 share/kicad/demos/pspice/pspice.pro
 share/kicad/demos/pspice/pspice.sch
+share/kicad/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
+share/kicad/demos/python_scripts_examples/plot_board.py
 share/kicad/demos/sonde xilinx/sonde xilinx-cache.lib
-share/kicad/demos/sonde xilinx/sonde xilinx.cmp
 share/kicad/demos/sonde xilinx/sonde xilinx.kicad_pcb
 share/kicad/demos/sonde xilinx/sonde xilinx.net
 share/kicad/demos/sonde xilinx/sonde xilinx.pro
 share/kicad/demos/sonde xilinx/sonde xilinx.sch
+share/kicad/demos/sonde xilinx/sonde xilinx_schlib.lib
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads.net
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads.pro
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads.sch
 share/kicad/demos/test_xil_95108/carte_test-cache.lib
-share/kicad/demos/test_xil_95108/carte_test.cmp
 share/kicad/demos/test_xil_95108/carte_test.kicad_pcb
 share/kicad/demos/test_xil_95108/carte_test.net
 share/kicad/demos/test_xil_95108/carte_test.pro
 share/kicad/demos/test_xil_95108/carte_test.sch
+share/kicad/demos/test_xil_95108/carte_test_schlib.lib
+share/kicad/demos/test_xil_95108/fp-lib-table
 share/kicad/demos/video/bus_pci.sch
 share/kicad/demos/video/esvideo.sch
+share/kicad/demos/video/fp-lib-table
 share/kicad/demos/video/graphic.sch
+share/kicad/demos/video/libs/footprints.pretty/LRTDK.kicad_mod
+share/kicad/demos/video/libs/footprints.pretty/PLCC68.kicad_mod
+share/kicad/demos/video/libs/footprints.pretty/PLCC84.kicad_mod
+share/kicad/demos/video/libs/footprints.pretty/sim72.kicad_mod
+share/kicad/demos/video/libs/video_schlib.lib
 share/kicad/demos/video/modul.sch
 share/kicad/demos/video/muxdata.sch
 share/kicad/demos/video/pal-ntsc.sch
 share/kicad/demos/video/rams.sch
 share/kicad/demos/video/video-cache.lib
-share/kicad/demos/video/video.cmp
 share/kicad/demos/video/video.kicad_pcb
 share/kicad/demos/video/video.net
 share/kicad/demos/video/video.pro
 share/kicad/demos/video/video.sch
+share/kicad/template/gost_landscape.kicad_wks
+share/kicad/template/gost_portrait.kicad_wks
 share/kicad/template/kicad.pro
-share/kicad/template/raspberrypi-gpio/meta/brd.png
-share/kicad/template/raspberrypi-gpio/meta/icon.png
-share/kicad/template/raspberrypi-gpio/meta/info.html
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio-cache.lib
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio.cmp
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio.kicad_pcb
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio.net
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio.pro
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio.sch
-share/kicad/template/raspberrypi-gpio/raspberrypi-gpio.stf
-share/kicad/template/stm32f100-discovery-shield/meta/board_stm32vl_discovery.png
-share/kicad/template/stm32f100-discovery-shield/meta/icon.png
-share/kicad/template/stm32f100-discovery-shield/meta/info.html
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield-cache.lib
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.cmp
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.dcm
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.kicad_pcb
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.lib
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.mod
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.net
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.pro
-share/kicad/template/stm32f100-discovery-shield/stm32f100-discovery-shield.sch
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack.dcm
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack.lib
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40-cache.lib
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40.cmp
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40.mod
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40.net
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40.pro
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40.sch
-share/kicad/template/ti-stellaris-boosterpack40/boosterpack40_min.kicad_pcb
-share/kicad/template/ti-stellaris-boosterpack40/meta/icon.png
-share/kicad/template/ti-stellaris-boosterpack40/meta/info.html
-share/kicad/template/ti-stellaris-boosterpack40/meta/launchpad_standard40.png
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack.dcm
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack.lib
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min-cache.lib
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min.cmp
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min.kicad_pcb
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min.mod
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min.net
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min.pro
-share/kicad/template/ti-stellaris-boosterpack40_min/boosterpack40_min.sch
-share/kicad/template/ti-stellaris-boosterpack40_min/meta/icon.png
-share/kicad/template/ti-stellaris-boosterpack40_min/meta/info.html
-share/kicad/template/ti-stellaris-boosterpack40_min/meta/launchpad_standard40.png
+share/kicad/template/pagelayout_default.kicad_wks
+share/kicad/template/pagelayout_logo.kicad_wks
 share/mime/packages/kicad.xml
+share/mimelnk/application/x-kicad-pcb.desktop
 share/mimelnk/application/x-kicad-project.desktop
 share/mimelnk/application/x-kicad-schematic.desktop
diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
index 3eaabd7fceb..5e22a6a0e54 100644
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@@ -1,28 +1,31 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 00:21:18 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/02/03 19:34:33 bouyer Exp $
 
-SHA1 (kicad-stable-20140214.tar.gz) = d424af27803d26f08657e10cd37d7a5c37d01149
-RMD160 (kicad-stable-20140214.tar.gz) = daf0bc83219c7ba15e18d4211bf77b6a48f47b76
-SHA512 (kicad-stable-20140214.tar.gz) = 3ff31db631d79233c5db1eb095bf9d781b41adb8f0e13ac0f95eea69d28cf80977ef3d54c94ebedd504e5a5f6e1a79d5f409d08ec7d57d3e428f71416bc69b12
-Size (kicad-stable-20140214.tar.gz) = 13856340 bytes
-SHA1 (patch-CMakeLists.txt) = a3a91c4629a64815adf7c10724902163947482bb
-SHA1 (patch-CMakeModules_Functions.cmake) = 40581fd56de4d2cc3d3b6b0384d72373b7175dd3
-SHA1 (patch-CMakeModules_config.h.cmake) = e4e2e96f9923a73d60e0141a1f1de3a7c4dffed7
-SHA1 (patch-bitmaps_png_CMakeLists.txt) = 842fb628ab9eab3e67c6b73ee230b8d2a285d179
-SHA1 (patch-common-edaappl.cpp) = e9f0344f4d67566e9224402570b4666f44f3e925
-SHA1 (patch-common_richio.cpp) = 0fec7d5e6871a39d37882620c1853e94bae704dc
-SHA1 (patch-eeschema_netform.cpp) = 2ed91f042404973a4689b0885e4459872b8e8153
-SHA1 (patch-eeschema_sch_component.cpp) = d5f43448399625587394dfb474d5f3583eed1ce1
-SHA1 (patch-eeschema_sch_sheet.cpp) = ae7612dad83915de52dba578776bd8329e67a18d
-SHA1 (patch-eeschema_sch_sheet_path.cpp) = 2a214a215c8f0c334170d700b3a75a958adcad93
-SHA1 (patch-eeschema_sheet.cpp) = 45534b24d6f024605482c0327b89cee3c8d3a4a5
-SHA1 (patch-include-kicad_string.h) = 8165630c230a361567472fbce911e383512c944f
-SHA1 (patch-include_common.h) = e8013295bfa0f058752a3fcc654e95e510710104
-SHA1 (patch-include_hashtables.h) = 3f1b993daa48b4757d78ae42ecc969e5158da65e
-SHA1 (patch-pcbnew_CMakeLists.txt) = b7d3d89ab14cab065982ad51a4db006a0626aa4a
-SHA1 (patch-pcbnew_class_edge_mod.cpp) = 6847ab1057c94e3a04e4407dffab1cb08178c7df
-SHA1 (patch-pcbnew_class_module.cpp) = 36c75238f631e1ce4244395c32b44cfd4b0f819f
-SHA1 (patch-pcbnew_class_track.cpp) = 8602e76cdacd65231e730ab3c36eb85d56c3aad1
-SHA1 (patch-pcbnew_class_zone.cpp) = 7660bd6092bfaf5fda78e2b7650de9d0a2fb4473
-SHA1 (patch-pcbnew_kicad_plugin.cpp) = 44a0a354463a607b81eaa02ea953d45568cf2837
-SHA1 (patch-pcbnew_legacy_plugin.cpp) = af3722a66712593d91164a110e28fe31abbf2165
-SHA1 (patch-pcbnew_xchgmod.cpp) = 6718cc7d6f3f858ca5ca90342619dbaf591517c3
+SHA1 (kicad-4.0.1.tar.xz) = d46ffab97eff1420326515456fd2bd12d3a20fb8
+RMD160 (kicad-4.0.1.tar.xz) = 9d50f41675b2d06f56e5454951da8c7101163c30
+SHA512 (kicad-4.0.1.tar.xz) = da9d5ba7f6a323d80621304e368c9783febedf7c545f31a6ca69bddc8573e7c7aa127c774cc29e173eae947debd444b5a04b0483800d6c0d1303e32a714e3d26
+Size (kicad-4.0.1.tar.xz) = 10837804 bytes
+SHA1 (patch-CMakeLists.txt) = 3d5ed10c9ec1fb464312001ac5fb1de62073687c
+SHA1 (patch-CMakeModules_FindwxWidgets.cmake) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-CMakeModules_Functions.cmake) = e1ef61ae6c4675f70120fa65dd39525d315f5864
+SHA1 (patch-CMakeModules_WriteVersionHeader.cmake) = 9c494d470540fd48949ab0938281bfb5c8e02127
+SHA1 (patch-CMakeModules_config.h.cmake) = cdf0fcafdeef542db1b150ebbdf1ec5bacd459d7
+SHA1 (patch-bitmaps_png_CMakeLists.txt) = 1e41133cdcf540bfd183ffee08126037f16076e7
+SHA1 (patch-common_CMakeLists.txt) = 7d620b50e5651a19c9fdc4edb15eb51242c6c7e4
+SHA1 (patch-common_richio.cpp) = 3689e98ad76fef4b353c8cc0969a3312846cf5bd
+SHA1 (patch-cvpcb_CMakeLists.txt) = 45d77f698b96bb5ebc741dcb9fcb25f68e15c718
+SHA1 (patch-eeschema_CMakeLists.txt) = 3848fb41481b32300ebddbc8f9aa7f234cdfa6bc
+SHA1 (patch-eeschema_sch_component.cpp) = f7b3ffb7cecdb0f845e298c401e35cc85d17277c
+SHA1 (patch-eeschema_sch_sheet.cpp) = 22489b2100c8f20d47cd82aad27971351f678fc8
+SHA1 (patch-gerbview_CMakeLists.txt) = b9b3e5d001a442919a2f10b408ea091b71fcee9f
+SHA1 (patch-include-kicad_string.h) = 0fbc35c18d8f6042423b75967438078820271ea9
+SHA1 (patch-include_hashtables.h) = f7ba85f94ea33baac1476e930e1d07dab0864766
+SHA1 (patch-include_kiway.h) = 3e772f67f2b68a3eedae988300e51c9e15fc16b7
+SHA1 (patch-pagelayout_editor_CMakeLists.txt) = 25cde7e9f427cacb411f59faae4bc19be8b2ded2
+SHA1 (patch-pcb_calculator_CMakeLists.txt) = 0fb4ff4270bd2c53f9d6c7408ebe666a0d133af5
+SHA1 (patch-pcbnew_CMakeLists.txt) = 619acc6375c67be1a0f62fac0bc521871f82fd8b
+SHA1 (patch-pcbnew_class_edge_mod.cpp) = 6b09f52eaf94bca2ab502e2cf173f5bdfb88f20f
+SHA1 (patch-pcbnew_class_track.cpp) = 324793f496c14686f6905d4bf5facd10a83440a4
+SHA1 (patch-pcbnew_class_zone.cpp) = 3e492beba7bb76d0cb469221364de231e356221b
+SHA1 (patch-pcbnew_kicad_plugin.cpp) = 0998771aba506872e8227a72f8d6258d3c117d13
+SHA1 (patch-pcbnew_legacy_plugin.cpp) = e6f56a0e92a0a23f23640e44748c21218ce38e37
+SHA1 (patch-pcbnew_xchgmod.cpp) = 1c27a02cd3e51418fd8ce597e8455079892ac1a7
diff --git a/cad/kicad/patches/patch-CMakeLists.txt b/cad/kicad/patches/patch-CMakeLists.txt
index 8552fd5abfc..8865c72527e 100644
--- a/cad/kicad/patches/patch-CMakeLists.txt
+++ b/cad/kicad/patches/patch-CMakeLists.txt
@@ -1,36 +1,16 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
-Trust wxWidgets when locating its components.
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and containt multiple directories
 
---- CMakeLists.txt.orig	2011-07-04 10:40:16.000000000 +0000
-+++ CMakeLists.txt
-@@ -176,11 +176,17 @@ check_find_package_result(OPENGL_FOUND "
- # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
- 
- # On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base
--if(APPLE)
-+EXECUTE_PROCESS(
-+  COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --release
-+  OUTPUT_VARIABLE _wx_release
-+  RESULT_VARIABLE _wx_result
-+  ERROR_QUIET
-+)
-+IF(_wx_result EQUAL 0 AND _wx_release EQUAL "2.9" AND APPLE)
-     find_package(wxWidgets COMPONENTS gl adv html core net base xml QUIET)
--else(APPLE)
-+else(_wx_result EQUAL 0 AND _wx_release EQUAL "2.9" AND APPLE)
-     find_package(wxWidgets COMPONENTS gl aui adv html core net base xml QUIET)
--endif(APPLE)
-+endif(_wx_result EQUAL 0 AND _wx_release EQUAL "2.9" AND APPLE)
- check_find_package_result(wxWidgets_FOUND "wxWidgets")
- 
- 
-@@ -264,7 +270,7 @@ endif()
- # make uninstall rules
- #================================================
- configure_file(
--  "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
-+  "${PROJECT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
-   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-   IMMEDIATE @ONLY)
- 
+--- CMakeLists.txt.orig	2015-12-14 20:13:21.000000000 +0100
++++ CMakeLists.txt	2015-12-14 20:15:13.000000000 +0100
+@@ -826,7 +826,7 @@
+ # "make uninstall" rules

+ #================================================

+ configure_file(

+-    "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"

++    "${PROJECT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"

+     "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

+     IMMEDIATE @ONLY )

+ 

diff --git a/cad/kicad/patches/patch-CMakeModules_Functions.cmake b/cad/kicad/patches/patch-CMakeModules_Functions.cmake
index 98a81902dca..40135e681a7 100644
--- a/cad/kicad/patches/patch-CMakeModules_Functions.cmake
+++ b/cad/kicad/patches/patch-CMakeModules_Functions.cmake
@@ -1,19 +1,19 @@
-$NetBSD: patch-CMakeModules_Functions.cmake,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-CMakeModules_Functions.cmake,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
 Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
 and containt multiple directories
 
---- CMakeModules/Functions.cmake.orig	2014-02-14 20:02:52.000000000 +0100
-+++ CMakeModules/Functions.cmake	2014-02-14 20:03:21.000000000 +0100
-@@ -33,9 +33,9 @@
-             -DinputFile=${inputFile}
-             -DoutHeaderFile=${outHeaderFile}
-             -DoutCppFile=${outCppFile}
--            -P ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake
-+            -P ${PROJECT_SOURCE_DIR}/CMakeModules/TokenList2DsnLexer.cmake
-         DEPENDS ${inputFile}
--                ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake
-+                ${PROJECT_SOURCE_DIR}/CMakeModules/TokenList2DsnLexer.cmake
-         COMMENT "TokenList2DsnLexer.cmake creating:
-            ${outHeaderFile} and
-            ${outCppFile} from
+--- CMakeModules/Functions.cmake.orig	2015-12-14 20:13:21.000000000 +0100
++++ CMakeModules/Functions.cmake	2015-12-14 20:14:40.000000000 +0100
+@@ -36,9 +36,9 @@
+             -DinputFile=${inputFile}

+             -DoutHeaderFile=${outHeaderFile}

+             -DoutCppFile=${outCppFile}

+-            -P ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

++            -P ${PROJECT_SOURCE_DIR}/CMakeModules/TokenList2DsnLexer.cmake

+         DEPENDS ${inputFile}

+-                ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

++                ${PROJECT_SOURCE_DIR}/CMakeModules/TokenList2DsnLexer.cmake

+         COMMENT "TokenList2DsnLexer.cmake creating:

+            ${outHeaderFile} and

+            ${outCppFile} from

diff --git a/cad/kicad/patches/patch-CMakeModules_WriteVersionHeader.cmake b/cad/kicad/patches/patch-CMakeModules_WriteVersionHeader.cmake
new file mode 100644
index 00000000000..3eb3f0d2735
--- /dev/null
+++ b/cad/kicad/patches/patch-CMakeModules_WriteVersionHeader.cmake
@@ -0,0 +1,22 @@
+$NetBSD: patch-CMakeModules_WriteVersionHeader.cmake,v 1.1 2016/02/03 19:34:33 bouyer Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and containt multiple directories
+
+--- CMakeModules/WriteVersionHeader.cmake.orig	2015-12-14 20:13:21.000000000 +0100
++++ CMakeModules/WriteVersionHeader.cmake	2015-12-14 20:14:58.000000000 +0100
+@@ -32,12 +32,12 @@
+     # Detect the appropiate VCS and set the version string.

+     if( EXISTS "${SRC_PATH}/.bzr" )

+         message( STATUS "Using Bazaar to determine build version string." )

+-        include( ${CMAKE_MODULE_PATH}/CreateBzrVersionHeader.cmake )

++        include( ${PROJECT_SOURCE_DIR}/CMakeModules/CreateBzrVersionHeader.cmake )

+         create_bzr_version_header( ${SRC_PATH} )

+         set( _wvh_version_str ${KICAD_BUILD_VERSION} )

+     elseif( EXISTS "${SRC_PATH}/.git" )

+         message( STATUS "Using Git to determine build version string." )

+-        include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )

++        include( ${PROJECT_SOURCE_DIR}/CMakeModules/CreateGitVersionHeader.cmake )

+         create_git_version_header( ${SRC_PATH} )

+         set( _wvh_version_str ${KICAD_BUILD_VERSION} )

+     endif()

diff --git a/cad/kicad/patches/patch-CMakeModules_config.h.cmake b/cad/kicad/patches/patch-CMakeModules_config.h.cmake
index 61a8b83fe7a..0bdb4eaedea 100644
--- a/cad/kicad/patches/patch-CMakeModules_config.h.cmake
+++ b/cad/kicad/patches/patch-CMakeModules_config.h.cmake
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeModules_config.h.cmake,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-CMakeModules_config.h.cmake,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
 Fix compile problem due to ciso646.
 
---- CMakeModules/config.h.cmake.orig	2011-11-27 11:43:14.000000000 +0000
-+++ CMakeModules/config.h.cmake
-@@ -32,7 +32,7 @@
- #cmakedefine HAVE_ISO646_H
- 
- #if defined( HAVE_ISO646_H )
--#include <iso646.h>
-+#include <ciso646>
- #endif
- 
- #if defined( HAVE_STRCASECMP )
+--- ./CMakeModules/config.h.cmake.orig	2015-11-29 20:57:27.000000000 +0100
++++ ./CMakeModules/config.h.cmake	2015-12-11 17:46:32.000000000 +0100
+@@ -36,7 +36,7 @@
+ #cmakedefine HAVE_ISO646_H

+ 

+ #if defined( HAVE_ISO646_H )

+-#include <iso646.h>

++#include <ciso646>

+ #endif

+ 

+ #if defined( HAVE_STRCASECMP )

diff --git a/cad/kicad/patches/patch-bitmaps_png_CMakeLists.txt b/cad/kicad/patches/patch-bitmaps_png_CMakeLists.txt
index 75ab5fa3f01..7bdf3337559 100644
--- a/cad/kicad/patches/patch-bitmaps_png_CMakeLists.txt
+++ b/cad/kicad/patches/patch-bitmaps_png_CMakeLists.txt
@@ -1,31 +1,19 @@
-$NetBSD: patch-bitmaps_png_CMakeLists.txt,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-bitmaps_png_CMakeLists.txt,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
 Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
 and containt multiple directories
 
---- bitmaps_png/CMakeLists.txt.orig	2014-02-14 21:55:49.000000000 +0100
-+++ bitmaps_png/CMakeLists.txt	2014-02-14 22:37:57.000000000 +0100
-@@ -602,9 +602,9 @@
- 
-         COMMAND rm -f ${outFile}.tmp
-         COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}
--            -P ${CMAKE_MODULE_PATH}/PNG2cpp.cmake
-+            -P ${PROJECT_SOURCE_DIR}/CMakeModules/PNG2cpp.cmake
- 
--        DEPENDS ${inputFile} ${CMAKE_MODULE_PATH}/PNG2cpp.cmake
-+        DEPENDS ${inputFile} ${PROJECT_SOURCE_DIR}/CMakeModules/PNG2cpp.cmake
- 
-         POST_BUILD
-         COMMAND ${eol2unix_EXECUTABLE} ${outFile}
-@@ -619,9 +619,9 @@
-         OUTPUT  ${outFile}
- 
-         COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}
--            -P ${CMAKE_MODULE_PATH}/PNG2cpp.cmake
-+            -P ${PROJECT_SOURCE_DIR}/CMakeModules/PNG2cpp.cmake
- 
--        DEPENDS ${inputFile} ${CMAKE_MODULE_PATH}/PNG2cpp.cmake
-+        DEPENDS ${inputFile} ${PROJECT_SOURCE_DIR}/CMakeModules/PNG2cpp.cmake
-         COMMENT "Creating ${outFile}"
-         )
- endfunction()
+--- bitmaps_png/CMakeLists.txt.orig	2015-12-14 20:13:21.000000000 +0100
++++ bitmaps_png/CMakeLists.txt	2015-12-14 20:14:25.000000000 +0100
+@@ -636,9 +636,9 @@
+         OUTPUT  ${outFile}

+ 

+         COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}

+-            -P ${CMAKE_MODULE_PATH}/PNG2cpp.cmake

++            -P ${PROJECT_SOURCE_DIR}/CMakeModules/PNG2cpp.cmake

+ 

+-        DEPENDS ${inputFile} ${CMAKE_MODULE_PATH}/PNG2cpp.cmake

++        DEPENDS ${inputFile} ${PROJECT_SOURCE_DIR}/CMakeModules/PNG2cpp.cmake

+         COMMENT "Creating ${outFile}"

+         )

+ endfunction()

diff --git a/cad/kicad/patches/patch-common-edaappl.cpp b/cad/kicad/patches/patch-common-edaappl.cpp
deleted file mode 100644
index 23ff1405de6..00000000000
--- a/cad/kicad/patches/patch-common-edaappl.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-common-edaappl.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
-
-Building on Mac OS X requires CoreFoundation headers.
-
---- common/edaappl.cpp.orig	2014-02-14 21:55:49.000000000 +0100
-+++ common/edaappl.cpp	2014-02-14 22:39:14.000000000 +0100
-@@ -41,6 +41,10 @@
- #include <wx/snglinst.h>
- #include <wx/tokenzr.h>
- 
-+#ifdef __DARWIN__
-+#include <CoreFoundation/CFBundle.h>
-+#endif
-+
- #include <appl_wxstruct.h>
- #include <wxstruct.h>
- #include <macros.h>
diff --git a/cad/kicad/patches/patch-common_CMakeLists.txt b/cad/kicad/patches/patch-common_CMakeLists.txt
new file mode 100644
index 00000000000..175ae93d7e4
--- /dev/null
+++ b/cad/kicad/patches/patch-common_CMakeLists.txt
@@ -0,0 +1,25 @@
+$NetBSD: patch-common_CMakeLists.txt,v 1.1 2016/02/03 19:34:33 bouyer Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and containt multiple directories
+
+--- common/CMakeLists.txt.orig	2015-12-14 20:13:21.000000000 +0100
++++ common/CMakeLists.txt	2015-12-14 20:16:14.000000000 +0100
+@@ -17,7 +17,7 @@
+     COMMAND ${CMAKE_COMMAND}

+         -DinputFiles="${PROJECT_SOURCE_DIR}/common/gal/opengl/shader.vert\\;${PROJECT_SOURCE_DIR}/common/gal/opengl/shader.frag"

+         -DoutputFile="shader_src.h"

+-        -P ${CMAKE_MODULE_PATH}/Shaders.cmake

++        -P ${PROJECT_SOURCE_DIR}/CMakeModules/Shaders.cmake

+     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/common/gal/opengl

+     COMMENT "Generating headers containing GLSL source code"

+     )

+@@ -127,7 +127,7 @@
+         -DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h

+         -DSRC_PATH=${PROJECT_SOURCE_DIR}

+         -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}

+-        -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake

++        -P ${PROJECT_SOURCE_DIR}/CMakeModules/WriteVersionHeader.cmake

+     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

+     COMMENT "Generating version string header"

+     )

diff --git a/cad/kicad/patches/patch-common_richio.cpp b/cad/kicad/patches/patch-common_richio.cpp
index 794d3ebc8ed..94eb1e8b9ea 100644
--- a/cad/kicad/patches/patch-common_richio.cpp
+++ b/cad/kicad/patches/patch-common_richio.cpp
@@ -1,16 +1,16 @@
-$NetBSD: patch-common_richio.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-common_richio.cpp,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
 Fix non-portable use of setvbuf()
 Reported upstream as bug id 1280897
 
---- common/richio.cpp.orig	2014-02-15 20:22:32.000000000 +0100
-+++ common/richio.cpp	2014-02-15 20:23:12.000000000 +0100
-@@ -157,7 +157,7 @@
- {
-     if( doOwn && ftell( aFile ) == 0L )
-     {
--#ifndef __WXMAC__
+--- common/richio.cpp.orig	2015-12-11 17:40:20.000000000 +0100
++++ common/richio.cpp	2015-12-11 17:39:05.000000000 +0100
+@@ -215,7 +215,7 @@
+ {

+     if( doOwn && ftell( aFile ) == 0L )

+     {

+-#ifndef __WXMAC__

 +#if !defined(__WXMAC__) && !defined(__NetBSD__)
-         setvbuf( fp, NULL, _IOFBF, BUFSIZ * 8 );
- #endif
-     }
+         setvbuf( fp, NULL, _IOFBF, BUFSIZ * 8 );

+ #endif

+     }

diff --git a/cad/kicad/patches/patch-cvpcb_CMakeLists.txt b/cad/kicad/patches/patch-cvpcb_CMakeLists.txt
new file mode 100644
index 00000000000..344806f4378
--- /dev/null
+++ b/cad/kicad/patches/patch-cvpcb_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-cvpcb_CMakeLists.txt,v 1.1 2016/02/03 19:34:33 bouyer Exp $
+
+Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+
+--- cvpcb/CMakeLists.txt.orig	2015-12-16 14:47:20.000000000 +0100
++++ cvpcb/CMakeLists.txt	2015-12-16 14:49:49.000000000 +0100
+@@ -173,6 +173,9 @@
+     set_target_properties( cvpcb_kiface PROPERTIES

+         LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_cvpcb.kiface.map" )

+ endif()

++
++set_property(TARGET cvpcb_kiface APPEND_STRING
++	PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
+ 

+ # these 2 binaries are a matched set, keep them together:

+ if( APPLE )

diff --git a/cad/kicad/patches/patch-eeschema_CMakeLists.txt b/cad/kicad/patches/patch-eeschema_CMakeLists.txt
new file mode 100644
index 00000000000..3d522acd246
--- /dev/null
+++ b/cad/kicad/patches/patch-eeschema_CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD: patch-eeschema_CMakeLists.txt,v 1.1 2016/02/03 19:34:33 bouyer Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and containt multiple directories
+
+Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+
+--- eeschema/CMakeLists.txt.orig	2015-12-09 17:21:54.000000000 +0100
++++ eeschema/CMakeLists.txt	2015-12-16 14:50:58.000000000 +0100
+@@ -199,7 +199,7 @@
+     COMMAND ${CMAKE_COMMAND}

+         -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.html

+         -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help_html.h

+-        -P ${CMAKE_MODULE_PATH}/Html2C.cmake

++        -P ${PROJECT_SOURCE_DIR}/CMakeModules/Html2C.cmake

+     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.html

+     COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help_html.h

+        from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.html"

+@@ -278,6 +278,9 @@
+         LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=eeschema.map"

+         )

+ endif()

++
++set_property(TARGET eeschema_kiface APPEND_STRING
++	PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
+ 

+ # these 2 binaries are a matched set, keep them together:

+ if( APPLE )

diff --git a/cad/kicad/patches/patch-eeschema_netform.cpp b/cad/kicad/patches/patch-eeschema_netform.cpp
deleted file mode 100644
index 139a13140a9..00000000000
--- a/cad/kicad/patches/patch-eeschema_netform.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-eeschema_netform.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
-64bit time_t fix
-Reported upstream as bug id 1280901
-
---- eeschema/netform.cpp.orig	2014-02-15 15:35:29.000000000 +0100
-+++ eeschema/netform.cpp	2014-02-15 15:48:58.000000000 +0100
-@@ -1046,7 +1046,7 @@
-             xsheetpath->AddAttribute( sNames, path->PathHumanReadable() );
-             xsheetpath->AddAttribute( sTStamps, path->Path() );
- 
--            timeStamp.Printf( sTSFmt, comp->GetTimeStamp() );
-+            timeStamp.Printf( sTSFmt, (u_long)comp->GetTimeStamp() );
-             xcomp->AddChild( node( sTStamp, timeStamp ) );
-         }
-     }
-@@ -1134,7 +1134,7 @@
-             }
- 
-             ret |= fprintf( out, "\n$BeginComponent\n" );
--            ret |= fprintf( out, "TimeStamp=%8.8lX\n", comp->m_TimeStamp );
-+            ret |= fprintf( out, "TimeStamp=%8.8lX\n", (u_long)comp->m_TimeStamp );
-             ret |= fprintf( out, "Footprint=%s\n", TO_UTF8( footprint ) );
- 
-             field = wxT( "Reference=" ) + comp->GetRef( path ) + wxT( "\n" );
diff --git a/cad/kicad/patches/patch-eeschema_sch_component.cpp b/cad/kicad/patches/patch-eeschema_sch_component.cpp
index aefb5809377..09807849162 100644
--- a/cad/kicad/patches/patch-eeschema_sch_component.cpp
+++ b/cad/kicad/patches/patch-eeschema_sch_component.cpp
@@ -1,46 +1,17 @@
-$NetBSD: patch-eeschema_sch_component.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-eeschema_sch_component.cpp,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- eeschema/sch_component.cpp.orig	2014-02-15 15:23:19.000000000 +0100
-+++ eeschema/sch_component.cpp	2014-02-15 15:38:12.000000000 +0100
-@@ -392,7 +392,7 @@
- 
-     wxString str;
- 
--    str.Printf( wxT( "%8.8lX" ), m_TimeStamp );
-+    str.Printf( wxT( "%8.8lX" ), (u_long)m_TimeStamp );
-     return sheet->Path() + str;
- }
- 
-@@ -527,8 +527,8 @@
- {
-     wxString string_timestamp, string_oldtimestamp;
- 
--    string_timestamp.Printf( wxT( "%08lX" ), aNewTimeStamp );
--    string_oldtimestamp.Printf( wxT( "%08lX" ), m_TimeStamp );
-+    string_timestamp.Printf( wxT( "%08lX" ), (u_long)aNewTimeStamp );
-+    string_oldtimestamp.Printf( wxT( "%08lX" ), (u_long)m_TimeStamp );
-     EDA_ITEM::SetTimeStamp( aNewTimeStamp );
- 
-     for( unsigned ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ )
-@@ -1004,7 +1004,7 @@
-         return false;
- 
-     /* Generate unit number, convert and time stamp*/
--    if( fprintf( f, "U %d %d %8.8lX\n", m_unit, m_convert, m_TimeStamp ) == EOF )
-+    if( fprintf( f, "U %d %d %8.8lX\n", m_unit, m_convert, (u_long)m_TimeStamp ) == EOF )
-         return false;
- 
-     /* Save the position */
-@@ -1200,7 +1200,9 @@
- 
-         if( line[0] == 'U' )
-         {
--            sscanf( line + 1, "%d %d %lX", &m_unit, &m_convert, &m_TimeStamp );
+--- eeschema/sch_component.cpp.orig	2015-12-11 17:52:09.000000000 +0100
++++ eeschema/sch_component.cpp	2015-12-11 17:52:12.000000000 +0100
+@@ -1240,7 +1240,9 @@
+ 

+         if( line[0] == 'U' )

+         {

+-            sscanf( line + 1, "%d %d %lX", &m_unit, &m_convert, &m_TimeStamp );

 +	    u_long tmstp;
-+            sscanf( line + 1, "%d %d %lX", &m_unit, &m_convert, &tmstp );
-+	    m_TimeStamp = tmstp;
-         }
-         else if( line[0] == 'P' )
-         {
++            sscanf( line + 1, "%d %d %lX", &m_unit, &m_convert, &tmstp );

++	    tmstp = m_TimeStamp;
+         }

+         else if( line[0] == 'P' )

+         {

diff --git a/cad/kicad/patches/patch-eeschema_sch_sheet.cpp b/cad/kicad/patches/patch-eeschema_sch_sheet.cpp
index 53e81dca15d..e166ae8aa6e 100644
--- a/cad/kicad/patches/patch-eeschema_sch_sheet.cpp
+++ b/cad/kicad/patches/patch-eeschema_sch_sheet.cpp
@@ -1,46 +1,17 @@
-$NetBSD: patch-eeschema_sch_sheet.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-eeschema_sch_sheet.cpp,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- eeschema/sch_sheet.cpp.orig	2014-02-15 15:39:08.000000000 +0100
-+++ eeschema/sch_sheet.cpp	2014-02-15 15:40:13.000000000 +0100
-@@ -53,8 +53,8 @@
-     SetTimeStamp( GetNewTimeStamp() );
-     m_sheetNameSize = m_fileNameSize = DEFAULT_TEXT_SIZE;
-     m_screen = NULL;
--    m_name.Printf( wxT( "Sheet%8.8lX" ), m_TimeStamp );
--    m_fileName.Printf( wxT( "file%8.8lX.sch" ), m_TimeStamp );
-+    m_name.Printf( wxT( "Sheet%8.8lX" ), (u_long)m_TimeStamp );
-+    m_fileName.Printf( wxT( "file%8.8lX.sch" ), (u_long)m_TimeStamp );
- }
- 
- 
-@@ -142,7 +142,7 @@
-         return false;
- 
-     //save the unique timestamp, like other schematic parts.
--    if( fprintf( aFile, "U %8.8lX\n", m_TimeStamp ) == EOF )
-+    if( fprintf( aFile, "U %8.8lX\n", (u_long)m_TimeStamp ) == EOF )
-         return false;
- 
-     /* Save schematic sheetname and filename. */
+--- eeschema/sch_sheet.cpp.orig	2015-12-11 17:53:27.000000000 +0100
++++ eeschema/sch_sheet.cpp	2015-12-11 17:54:26.000000000 +0100
 @@ -219,7 +219,9 @@
- 
-         if( ((char*)aLine)[0] == 'U' )
-         {
--            sscanf( ((char*)aLine) + 1, "%lX", &m_TimeStamp );
+ 

+         if( ((char*)aLine)[0] == 'U' )

+         {

+-            sscanf( ((char*)aLine) + 1, "%lX", &m_TimeStamp );

 +	    u_long tmstp;
-+            sscanf( ((char*)aLine) + 1, "%lX", &tmstp );
++            sscanf( ((char*)aLine) + 1, "%lX", &tmstp );

 +	    m_TimeStamp = tmstp;
-             if( m_TimeStamp == 0 )  // zero is not unique!
-                 SetTimeStamp( GetNewTimeStamp() );
-             continue;
-@@ -828,7 +830,7 @@
- 
- #if 0   // Set to 1 to display the sheet time stamp (mainly for test)
-     wxString msg;
--    msg.Printf( wxT( "%.8X" ), m_TimeStamp );
-+    msg.Printf( wxT( "%.8X" ), (u_long)m_TimeStamp );
-     aList.push_back( MSG_PANEL_ITEM( _( "Time Stamp" ), msg, BLUE ) );
- #endif
- }
+             if( m_TimeStamp == 0 )  // zero is not unique!

+                 SetTimeStamp( GetNewTimeStamp() );

+             continue;

diff --git a/cad/kicad/patches/patch-eeschema_sch_sheet_path.cpp b/cad/kicad/patches/patch-eeschema_sch_sheet_path.cpp
deleted file mode 100644
index e50fc4c3ad3..00000000000
--- a/cad/kicad/patches/patch-eeschema_sch_sheet_path.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-eeschema_sch_sheet_path.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
-64bit time_t fix
-Reported upstream as bug id 1280901
-
---- eeschema/sch_sheet_path.cpp.orig	2014-02-15 15:50:43.000000000 +0100
-+++ eeschema/sch_sheet_path.cpp	2014-02-15 15:50:45.000000000 +0100
-@@ -200,7 +200,7 @@
-     // it's timestamp changes anyway.
-     for( unsigned i = 1; i < m_numSheets; i++ )
-     {
--        t.Printf( _( "%8.8lX/" ), m_sheets[i]->GetTimeStamp() );
-+        t.Printf( _( "%8.8lX/" ), (u_long)m_sheets[i]->GetTimeStamp() );
-         s = s + t;
-     }
- 
diff --git a/cad/kicad/patches/patch-eeschema_sheet.cpp b/cad/kicad/patches/patch-eeschema_sheet.cpp
deleted file mode 100644
index 6d91a94cb04..00000000000
--- a/cad/kicad/patches/patch-eeschema_sheet.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-eeschema_sheet.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
-64bit time_t fix
-Reported upstream as bug id 1280901
-
---- eeschema/sheet.cpp.orig	2014-02-15 15:49:44.000000000 +0100
-+++ eeschema/sheet.cpp	2014-02-15 15:49:51.000000000 +0100
-@@ -205,7 +205,7 @@
-     aSheet->SetSheetNameSize( ReturnValueFromString( g_UserUnit, dlg.GetSheetNameTextSize() ) );
- 
-     if( aSheet->GetName().IsEmpty() )
--        aSheet->SetName( wxString::Format( wxT( "Sheet%8.8lX" ), aSheet->GetTimeStamp() ) );
-+        aSheet->SetName( wxString::Format( wxT( "Sheet%8.8lX" ), (u_long)aSheet->GetTimeStamp() ) );
- 
-     m_canvas->MoveCursorToCrossHair();
-     m_canvas->SetIgnoreMouseEvents( false );
diff --git a/cad/kicad/patches/patch-gerbview_CMakeLists.txt b/cad/kicad/patches/patch-gerbview_CMakeLists.txt
new file mode 100644
index 00000000000..6a966d2e2b9
--- /dev/null
+++ b/cad/kicad/patches/patch-gerbview_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-gerbview_CMakeLists.txt,v 1.1 2016/02/03 19:34:33 bouyer Exp $
+
+Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+
+--- gerbview/CMakeLists.txt.orig	2015-12-16 14:47:22.000000000 +0100
++++ gerbview/CMakeLists.txt	2015-12-16 14:51:07.000000000 +0100
+@@ -143,6 +143,9 @@
+     set_target_properties( gerbview_kiface PROPERTIES

+         LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" )

+ endif()

++
++set_property(TARGET gerbview_kiface APPEND_STRING
++	PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
+ 

+ # if building gerbview, then also build gerbview_kiface if out of date.

+ add_dependencies( gerbview gerbview_kiface )

diff --git a/cad/kicad/patches/patch-include-kicad_string.h b/cad/kicad/patches/patch-include-kicad_string.h
index 4b145e0dfa9..69314df04ce 100644
--- a/cad/kicad/patches/patch-include-kicad_string.h
+++ b/cad/kicad/patches/patch-include-kicad_string.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-include-kicad_string.h,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-include-kicad_string.h,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
 Standard string library should be included as well.
 
---- include/kicad_string.h.orig	2011-11-27 11:43:14.000000000 +0000
-+++ include/kicad_string.h
-@@ -9,6 +9,7 @@
- #ifndef KICAD_STRING_H_
- #define KICAD_STRING_H_
- 
+--- include/kicad_string.h.orig	2015-12-11 17:57:10.000000000 +0100
++++ include/kicad_string.h	2015-12-11 17:57:22.000000000 +0100
+@@ -30,6 +30,7 @@
+ #ifndef KICAD_STRING_H_

+ #define KICAD_STRING_H_

+ 

 +#include <string>
- #include <wx/string.h>
- 
- 
+ #include <wx/string.h>

+ #include <wx/filename.h>

+ 

diff --git a/cad/kicad/patches/patch-include_common.h b/cad/kicad/patches/patch-include_common.h
deleted file mode 100644
index 350e5e1c279..00000000000
--- a/cad/kicad/patches/patch-include_common.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-include_common.h,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
-
-Remove bogus error
-
---- include/common.h.orig	2014-02-14 23:04:25.000000000 +0100
-+++ include/common.h	2014-02-14 23:04:40.000000000 +0100
-@@ -46,13 +46,6 @@
- #   error "You must use '--enable-printarch' in your wx library configuration."
- #endif
- 
--#if defined( __WXGTK__ )
--#   if !wxUSE_LIBGNOMEPRINT && !wxUSE_GTKPRINT && !SWIG
--#       error "You must use '--with-gnomeprint' or '--with-gtkprint' in your wx library configuration."
--#   endif
--#endif
--
--
- class wxAboutDialogInfo;
- 
- // Flag for special keys
diff --git a/cad/kicad/patches/patch-include_hashtables.h b/cad/kicad/patches/patch-include_hashtables.h
index 05d9435deda..9278a2fbd81 100644
--- a/cad/kicad/patches/patch-include_hashtables.h
+++ b/cad/kicad/patches/patch-include_hashtables.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-include_hashtables.h,v 1.1 2014/02/21 20:17:03 joerg Exp $
+$NetBSD: patch-include_hashtables.h,v 1.2 2016/02/03 19:34:33 bouyer Exp $
 
---- include/hashtables.h.orig	2014-02-21 00:47:35.000000000 +0000
-+++ include/hashtables.h
-@@ -50,7 +50,7 @@ typedef std::unordered_map< std::string,
- #elif 1     // boost::unordered_map
- 
- // fix a compile bug at line 97 of boost/detail/container_fwd.hpp
--#define BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD
-+//#define BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD
- 
- #include <boost/unordered_map.hpp>
- 
+--- include/hashtables.h.orig	2015-12-11 17:59:12.000000000 +0100
++++ include/hashtables.h	2015-12-11 17:59:18.000000000 +0100
+@@ -48,7 +48,7 @@
+ #elif 1     // boost::unordered_map

+ 

+ // fix a compile bug at line 97 of boost/detail/container_fwd.hpp

+-#define BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD

++// #define BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD

+ 

+ #include <boost/unordered_map.hpp>

+ 

diff --git a/cad/kicad/patches/patch-include_kiway.h b/cad/kicad/patches/patch-include_kiway.h
new file mode 100644
index 00000000000..81ffdbf8635
--- /dev/null
+++ b/cad/kicad/patches/patch-include_kiway.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_kiway.h,v 1.1 2016/02/03 19:34:34 bouyer Exp $
+
+--- include/kiway.h.orig	2015-12-14 21:13:18.000000000 +0100
++++ include/kiway.h	2015-12-14 21:13:39.000000000 +0100
+@@ -114,7 +114,7 @@
+ // be mangled.

+ #define KIFACE_INSTANCE_NAME_AND_VERSION   "KIFACE_1"

+ 

+-#if defined(__linux__) || defined(__FreeBSD__)

++#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)

+  #define LIB_ENV_VAR    wxT( "LD_LIBRARY_PATH" )

+ #elif defined(__WXMAC__)

+  #define LIB_ENV_VAR    wxT( "DYLD_LIBRARY_PATH" )

diff --git a/cad/kicad/patches/patch-pagelayout_editor_CMakeLists.txt b/cad/kicad/patches/patch-pagelayout_editor_CMakeLists.txt
new file mode 100644
index 00000000000..c469ce1692b
--- /dev/null
+++ b/cad/kicad/patches/patch-pagelayout_editor_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-pagelayout_editor_CMakeLists.txt,v 1.1 2016/02/03 19:34:34 bouyer Exp $
+
+Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+
+--- pagelayout_editor/CMakeLists.txt.orig	2015-12-16 14:47:22.000000000 +0100
++++ pagelayout_editor/CMakeLists.txt	2015-12-16 14:51:27.000000000 +0100
+@@ -117,6 +117,9 @@
+     set_target_properties( pl_editor_kiface PROPERTIES

+         LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" )

+ endif()

++
++set_property(TARGET pl_editor_kiface APPEND_STRING
++	PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
+ 

+ # if building pl_editor, then also build pl_editor_kiface if out of date.

+ add_dependencies( pl_editor pl_editor_kiface )

diff --git a/cad/kicad/patches/patch-pcb_calculator_CMakeLists.txt b/cad/kicad/patches/patch-pcb_calculator_CMakeLists.txt
new file mode 100644
index 00000000000..e7be655e60a
--- /dev/null
+++ b/cad/kicad/patches/patch-pcb_calculator_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-pcb_calculator_CMakeLists.txt,v 1.1 2016/02/03 19:34:34 bouyer Exp $
+
+Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+
+--- pcb_calculator/CMakeLists.txt.orig	2015-12-16 14:47:22.000000000 +0100
++++ pcb_calculator/CMakeLists.txt	2015-12-16 14:51:42.000000000 +0100
+@@ -99,6 +99,9 @@
+     set_target_properties( pcb_calculator_kiface PROPERTIES

+         LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" )

+ endif()

++
++set_property(TARGET pcb_calculator_kiface APPEND_STRING
++	PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
+ 

+ # if building pcb_calculator, then also build pcb_calculator_kiface if out of date.

+ add_dependencies( pcb_calculator pcb_calculator_kiface )

diff --git a/cad/kicad/patches/patch-pcbnew_CMakeLists.txt b/cad/kicad/patches/patch-pcbnew_CMakeLists.txt
index a751db0c626..0bbbacdcd18 100644
--- a/cad/kicad/patches/patch-pcbnew_CMakeLists.txt
+++ b/cad/kicad/patches/patch-pcbnew_CMakeLists.txt
@@ -1,16 +1,28 @@
-$NetBSD: patch-pcbnew_CMakeLists.txt,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_CMakeLists.txt,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 
 Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
 and containt multiple directories
 
---- pcbnew/CMakeLists.txt.orig	2014-02-14 20:06:34.000000000 +0100
-+++ pcbnew/CMakeLists.txt	2014-02-14 20:06:38.000000000 +0100
-@@ -229,7 +229,7 @@
-     COMMAND ${CMAKE_COMMAND}
-         -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html
-         -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h
--        -P ${CMAKE_MODULE_PATH}/Html2C.cmake
-+        -P ${PROJECT_SOURCE_DIR}/CMakeModules/Html2C.cmake
-     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html
-     COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h
-        from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html"
+Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+
+--- pcbnew/CMakeLists.txt.orig	2015-12-09 17:21:54.000000000 +0100
++++ pcbnew/CMakeLists.txt	2015-12-16 14:52:03.000000000 +0100
+@@ -521,7 +521,7 @@
+     COMMAND ${CMAKE_COMMAND}

+         -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html

+         -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h

+-        -P ${CMAKE_MODULE_PATH}/Html2C.cmake

++        -P ${PROJECT_SOURCE_DIR}/CMakeModules/Html2C.cmake

+     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html

+     COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h

+        from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html"

+@@ -613,6 +613,9 @@
+         LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map"

+         )

+ endif()

++
++set_property(TARGET pcbnew_kiface APPEND_STRING
++	PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
+ 

+ # if building pcbnew, then also build pcbnew_kiface if out of date.

+ add_dependencies( pcbnew pcbnew_kiface )

diff --git a/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp b/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp
index 43c971a2c88..11f83640348 100644
--- a/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp
+++ b/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-pcbnew_class_edge_mod.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_class_edge_mod.cpp,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- pcbnew/class_edge_mod.cpp.orig	2014-02-15 15:51:50.000000000 +0100
-+++ pcbnew/class_edge_mod.cpp	2014-02-15 15:52:10.000000000 +0100
-@@ -248,7 +248,7 @@
-     aList.push_back( MSG_PANEL_ITEM( _( "Graphic Item" ), wxEmptyString, DARKCYAN ) );
-     aList.push_back( MSG_PANEL_ITEM( _( "Module" ), module->m_Reference->m_Text, DARKCYAN ) );
-     aList.push_back( MSG_PANEL_ITEM( _( "Value" ), module->m_Value->m_Text, BLUE ) );
--    msg.Printf( wxT( "%8.8lX" ), module->GetTimeStamp() );
-+    msg.Printf( wxT( "%8.8lX" ), (u_long)module->GetTimeStamp() );
-     aList.push_back( MSG_PANEL_ITEM( _( "TimeStamp" ), msg, BROWN ) );
-     aList.push_back( MSG_PANEL_ITEM( _( "Mod Layer" ), board->GetLayerName( module->GetLayer() ),
-                                      RED ) );
+--- pcbnew/class_edge_mod.cpp.orig	2015-12-11 18:00:51.000000000 +0100
++++ pcbnew/class_edge_mod.cpp	2015-12-11 18:01:09.000000000 +0100
+@@ -259,7 +259,7 @@
+ 

+     aList.push_back( MSG_PANEL_ITEM( _( "Footprint" ), module->GetReference(), DARKCYAN ) );

+     aList.push_back( MSG_PANEL_ITEM( _( "Value" ), module->GetValue(), BLUE ) );

+-    msg.Printf( wxT( "%8.8lX" ), module->GetTimeStamp() );

++    msg.Printf( wxT( "%8.8lX" ), (u_long)module->GetTimeStamp() );

+     aList.push_back( MSG_PANEL_ITEM( _( "TimeStamp" ), msg, BROWN ) );

+     aList.push_back( MSG_PANEL_ITEM( _( "Footprint Layer" ),

+                      module->GetLayerName(), RED ) );

diff --git a/cad/kicad/patches/patch-pcbnew_class_module.cpp b/cad/kicad/patches/patch-pcbnew_class_module.cpp
deleted file mode 100644
index 590af7088e5..00000000000
--- a/cad/kicad/patches/patch-pcbnew_class_module.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-pcbnew_class_module.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
-64bit time_t fix
-Reported upstream as bug id 1280901
-
---- pcbnew/class_module.cpp.orig	2014-02-15 15:41:28.000000000 +0100
-+++ pcbnew/class_module.cpp	2014-02-15 15:41:37.000000000 +0100
-@@ -458,7 +458,7 @@
-     aList.push_back( MSG_PANEL_ITEM( _( "Last Change" ), msg, BROWN ) );
- 
-     // display time stamp in schematic
--    msg.Printf( wxT( "%8.8lX" ), m_TimeStamp );
-+    msg.Printf( wxT( "%8.8lX" ), (u_long)m_TimeStamp );
-     aList.push_back( MSG_PANEL_ITEM( _( "Netlist path" ), m_Path, BROWN ) );
-     aList.push_back( MSG_PANEL_ITEM( _( "Layer" ), board->GetLayerName( m_Layer ), RED ) );
- 
diff --git a/cad/kicad/patches/patch-pcbnew_class_track.cpp b/cad/kicad/patches/patch-pcbnew_class_track.cpp
index 288ac2ef84a..97cdd8c5fad 100644
--- a/cad/kicad/patches/patch-pcbnew_class_track.cpp
+++ b/cad/kicad/patches/patch-pcbnew_class_track.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-pcbnew_class_track.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_class_track.cpp,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- pcbnew/class_track.cpp.orig	2014-02-15 15:42:13.000000000 +0100
-+++ pcbnew/class_track.cpp	2014-02-15 15:42:23.000000000 +0100
-@@ -161,7 +161,7 @@
-     NETINFO_ITEM* net;
-     BOARD* board = GetBoard();
- 
--    text << _( "Zone" ) << wxT( " " ) << wxString::Format( wxT( "(%08lX)" ), m_TimeStamp );
-+    text << _( "Zone" ) << wxT( " " ) << wxString::Format( wxT( "(%08lX)" ), (u_long)m_TimeStamp );
- 
-     if( board )
-     {
+--- pcbnew/class_track.cpp.orig	2015-12-11 18:02:48.000000000 +0100
++++ pcbnew/class_track.cpp	2015-12-11 18:03:02.000000000 +0100
+@@ -143,7 +143,7 @@
+     }

+ 

+     text.Printf( _( "Zone (%08lX) [%s] on %s" ),

+-                 m_TimeStamp, GetChars( nettxt ), GetChars( GetLayerName() ) );

++                 (u_long)m_TimeStamp, GetChars( nettxt ), GetChars( GetLayerName() ) );

+ 

+     return text;

+ }

diff --git a/cad/kicad/patches/patch-pcbnew_class_zone.cpp b/cad/kicad/patches/patch-pcbnew_class_zone.cpp
index 93a9a1a253c..8ec3be7df03 100644
--- a/cad/kicad/patches/patch-pcbnew_class_zone.cpp
+++ b/cad/kicad/patches/patch-pcbnew_class_zone.cpp
@@ -1,15 +1,22 @@
-$NetBSD: patch-pcbnew_class_zone.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_class_zone.cpp,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- pcbnew/class_zone.cpp.orig	2014-02-15 15:42:53.000000000 +0100
-+++ pcbnew/class_zone.cpp	2014-02-15 15:43:00.000000000 +0100
-@@ -946,7 +946,7 @@
-         text << wxT( " " ) << _( "(Keepout)" );
- 
-     text << wxT( " " );
--    text << wxString::Format( wxT( "(%08lX)" ), m_TimeStamp );
-+    text << wxString::Format( wxT( "(%08lX)" ), (u_long)m_TimeStamp );
- 
-     // Display net name for copper zones
-     if( !GetIsKeepout() )
+--- pcbnew/class_zone.cpp.orig	2015-12-11 18:03:57.000000000 +0100
++++ pcbnew/class_zone.cpp	2015-12-11 18:04:13.000000000 +0100
+@@ -818,7 +818,7 @@
+     if( GetIsKeepout() )

+         text << wxT( " " ) << _( "(Keepout)" );

+ 

+-    text << wxString::Format( wxT( " (%08lX)" ), m_TimeStamp );

++    text << wxString::Format( wxT( " (%08lX)" ), (u_long)m_TimeStamp );

+ 

+     // Display net name for copper zones

+     if( !GetIsKeepout() )

+@@ -852,4 +852,4 @@
+                  GetChars( GetLayerName() ) );

+ 

+     return msg;

+-}
+\ No newline at end of file
++}
diff --git a/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp b/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp
index 2ddebea6c69..3260b0c586c 100644
--- a/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp
+++ b/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp
@@ -1,78 +1,69 @@
-$NetBSD: patch-pcbnew_kicad_plugin.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_kicad_plugin.cpp,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- pcbnew/kicad_plugin.cpp.orig	2014-02-15 15:55:03.000000000 +0100
-+++ pcbnew/kicad_plugin.cpp	2014-02-15 15:56:10.000000000 +0100
-@@ -673,7 +673,7 @@
-     formatLayer( aDimension );
- 
-     if( aDimension->GetTimeStamp() )
--        m_out->Print( 0, " (tstamp %lX)", aDimension->GetTimeStamp() );
-+        m_out->Print( 0, " (tstamp %lX)", (u_long)aDimension->GetTimeStamp() );
- 
-     m_out->Print( 0, "\n" );
- 
-@@ -782,7 +782,7 @@
-         m_out->Print( 0, " (width %s)", FMT_IU( aSegment->GetWidth() ).c_str() );
- 
-     if( aSegment->GetTimeStamp() )
--        m_out->Print( 0, " (tstamp %lX)", aSegment->GetTimeStamp() );
-+        m_out->Print( 0, " (tstamp %lX)", (u_long)aSegment->GetTimeStamp() );
- 
-     if( aSegment->GetStatus() )
-         m_out->Print( 0, " (status %X)", aSegment->GetStatus() );
-@@ -855,7 +855,7 @@
-     /*  11-Nov-2021 remove if no one whines after a couple of months.  Simple graphic items
-         perhaps do not need these.
-     if( aModuleDrawing->GetTimeStamp() )
--        m_out->Print( 0, " (tstamp %lX)", aModuleDrawing->GetTimeStamp() );
-+        m_out->Print( 0, " (tstamp %lX)", (u_long)aModuleDrawing->GetTimeStamp() );
- 
-     if( aModuleDrawing->GetStatus() )
-         m_out->Print( 0, " (status %X)", aModuleDrawing->GetStatus() );
+--- pcbnew/kicad_plugin.cpp.orig	2015-12-11 18:05:12.000000000 +0100
++++ pcbnew/kicad_plugin.cpp	2015-12-11 18:14:06.000000000 +0100
+@@ -770,7 +770,7 @@
+     formatLayer( aDimension );

+ 

+     if( aDimension->GetTimeStamp() )

+-        m_out->Print( 0, " (tstamp %lX)", aDimension->GetTimeStamp() );

++        m_out->Print( 0, " (tstamp %lX)", (u_long)aDimension->GetTimeStamp() );

+ 

+     m_out->Print( 0, "\n" );

+ 

 @@ -879,7 +879,7 @@
-     formatLayer( aTarget );
- 
-     if( aTarget->GetTimeStamp() )
--        m_out->Print( 0, " (tstamp %lX)", aTarget->GetTimeStamp() );
-+        m_out->Print( 0, " (tstamp %lX)", (u_long)aTarget->GetTimeStamp() );
- 
-     m_out->Print( 0, ")\n" );
- }
-@@ -901,7 +901,7 @@
-     if( !( m_ctl & CTL_OMIT_TSTAMPS ) )
-     {
-         m_out->Print( 0, " (tedit %lX) (tstamp %lX)\n",
--                       aModule->GetLastEditTime(), aModule->GetTimeStamp() );
-+                       (u_long)aModule->GetLastEditTime(), (u_long)aModule->GetTimeStamp() );
-     }
-     else
-         m_out->Print( 0, "\n" );
-@@ -1216,7 +1216,7 @@
-     formatLayer( aText );
- 
-     if( aText->GetTimeStamp() )
--        m_out->Print( 0, " (tstamp %lX)", aText->GetTimeStamp() );
-+        m_out->Print( 0, " (tstamp %lX)", (u_long)aText->GetTimeStamp() );
- 
-     m_out->Print( 0, "\n" );
- 
-@@ -1324,7 +1324,7 @@
-     m_out->Print( 0, " (net %d)", aTrack->GetNet() );
- 
-     if( aTrack->GetTimeStamp() != 0 )
--        m_out->Print( 0, " (tstamp %lX)", aTrack->GetTimeStamp() );
-+        m_out->Print( 0, " (tstamp %lX)", (u_long)aTrack->GetTimeStamp() );
- 
-     if( aTrack->GetStatus() != 0 )
-         m_out->Print( 0, " (status %X)", aTrack->GetStatus() );
-@@ -1345,7 +1345,7 @@
- 
-     formatLayer( aZone );
- 
--    m_out->Print( 0, " (tstamp %lX)", aZone->GetTimeStamp() );
-+    m_out->Print( 0, " (tstamp %lX)", (u_long)aZone->GetTimeStamp() );
- 
-     // Save the outline aux info
-     std::string hatch;
+         m_out->Print( 0, " (width %s)", FMT_IU( aSegment->GetWidth() ).c_str() );

+ 

+     if( aSegment->GetTimeStamp() )

+-        m_out->Print( 0, " (tstamp %lX)", aSegment->GetTimeStamp() );

++        m_out->Print( 0, " (tstamp %lX)", (u_long)aSegment->GetTimeStamp() );

+ 

+     if( aSegment->GetStatus() )

+         m_out->Print( 0, " (status %X)", aSegment->GetStatus() );

+@@ -966,7 +966,7 @@
+     formatLayer( aTarget );

+ 

+     if( aTarget->GetTimeStamp() )

+-        m_out->Print( 0, " (tstamp %lX)", aTarget->GetTimeStamp() );

++        m_out->Print( 0, " (tstamp %lX)", (u_long)aTarget->GetTimeStamp() );

+ 

+     m_out->Print( 0, ")\n" );

+ }

+@@ -1003,7 +1003,7 @@
+ 

+     if( !( m_ctl & CTL_OMIT_TSTAMPS ) )

+     {

+-        m_out->Print( 0, " (tstamp %lX)\n", aModule->GetTimeStamp() );

++        m_out->Print( 0, " (tstamp %lX)\n", (u_long)aModule->GetTimeStamp() );

+     }

+     else

+         m_out->Print( 0, "\n" );

+@@ -1344,7 +1344,7 @@
+     formatLayer( aText );

+ 

+     if( aText->GetTimeStamp() )

+-        m_out->Print( 0, " (tstamp %lX)", aText->GetTimeStamp() );

++        m_out->Print( 0, " (tstamp %lX)", (u_long)aText->GetTimeStamp() );

+ 

+     m_out->Print( 0, "\n" );

+ 

+@@ -1452,7 +1452,7 @@
+     m_out->Print( 0, " (net %d)", m_mapping->Translate( aTrack->GetNetCode() ) );

+ 

+     if( aTrack->GetTimeStamp() != 0 )

+-        m_out->Print( 0, " (tstamp %lX)", aTrack->GetTimeStamp() );

++        m_out->Print( 0, " (tstamp %lX)", (u_long)aTrack->GetTimeStamp() );

+ 

+     if( aTrack->GetStatus() != 0 )

+         m_out->Print( 0, " (status %X)", aTrack->GetStatus() );

+@@ -1473,7 +1473,7 @@
+ 

+     formatLayer( aZone );

+ 

+-    m_out->Print( 0, " (tstamp %lX)", aZone->GetTimeStamp() );

++    m_out->Print( 0, " (tstamp %lX)", (u_long)aZone->GetTimeStamp() );

+ 

+     // Save the outline aux info

+     std::string hatch;

diff --git a/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp b/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp
index 226867e5697..4f5e31eca36 100644
--- a/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp
+++ b/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp
@@ -1,116 +1,105 @@
-$NetBSD: patch-pcbnew_legacy_plugin.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_legacy_plugin.cpp,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- pcbnew/legacy_plugin.cpp.orig	2014-02-14 21:55:49.000000000 +0100
-+++ pcbnew/legacy_plugin.cpp	2014-02-15 16:53:33.000000000 +0100
-@@ -1988,7 +1988,7 @@
- #endif
- 
-         int         makeType;
--        time_t      timeStamp;
-+        u_long      timeStamp;
-         int         layer, type, flags, net_code;
- 
-         // parse the 2nd line to determine the type of object
-@@ -2435,7 +2435,7 @@
-         else if( TESTLINE( "Ge" ) )
-         {
-             int     layer;
--            time_t  timestamp;
-+            u_long  timestamp;
-             int     shape;
- 
-             sscanf( line + SZ( "Ge" ), " %d %d %lX", &shape, &layer, &timestamp );
-@@ -2447,7 +2447,7 @@
-                 layer = LAST_NO_COPPER_LAYER;
- 
-             dim->SetLayer( layer );
--            dim->SetTimeStamp( timestamp );
-+            dim->SetTimeStamp( (time_t)timestamp );
-             dim->SetShape( shape );
-         }
- 
-@@ -3398,8 +3398,8 @@
-                     fmtBIUPoint( me->GetPosition() ).c_str(),    // m_Pos.x, m_Pos.y,
-                     fmtDEG( orient ).c_str(),
-                     me->GetLayer(),
--                    me->GetLastEditTime(),
--                    me->GetTimeStamp(),
-+                    (u_long)me->GetLastEditTime(),
-+                    (u_long)me->GetTimeStamp(),
-                     statusTxt );
- 
-     fprintf( m_fp, "Li %s\n", TO_UTF8( me->GetLibRef() ) );
-@@ -3414,7 +3414,7 @@
-         fprintf( m_fp, "Kw %s\n", TO_UTF8( me->GetKeywords() ) );
-     }
- 
--    fprintf( m_fp, "Sc %lX\n", me->GetTimeStamp() );
-+    fprintf( m_fp, "Sc %lX\n", (u_long)me->GetTimeStamp() );
-     fprintf( m_fp, "AR %s\n", TO_UTF8( me->GetPath() ) );
-     fprintf( m_fp, "Op %X %X 0\n", me->m_CntRot90, me->m_CntRot180 );
- 
-@@ -3543,7 +3543,7 @@
-              fmtBIUPoint( me->GetPosition() ).c_str(),
-              fmtBIU( me->GetSize() ).c_str(),
-              fmtBIU( me->GetWidth() ).c_str(),
--             me->GetTimeStamp()
-+             (u_long)me->GetTimeStamp()
-              );
- 
-     fprintf( m_fp, "$EndPCB_TARGET\n" );
-@@ -3569,7 +3569,7 @@
-                  me->GetLayer(),
-                  me->GetType(),
-                  fmtDEG( me->GetAngle() ).c_str(),
--                 me->GetTimeStamp(),
-+                 (u_long)me->GetTimeStamp(),
-                  me->GetStatus()
-                  );
-     }
-@@ -3579,7 +3579,7 @@
-                  me->GetLayer(),
-                  me->GetType(),
-                  fmtDEG( me->GetAngle() ).c_str(),
--                 me->GetTimeStamp(),
-+                 (u_long)me->GetTimeStamp(),
-                  me->GetStatus(),
-                  fmtBIUPoint( me->GetBezControl1() ).c_str(),
-                  fmtBIUPoint( me->GetBezControl2() ).c_str()
-@@ -3607,7 +3607,7 @@
- 
-     fprintf(m_fp, "De %d %d %d %lX %X\n",
-             me->GetLayer(), type, me->GetNet(),
--            me->GetTimeStamp(), me->GetStatus() );
-+            (u_long)me->GetTimeStamp(), me->GetStatus() );
- }
- 
- 
-@@ -3619,7 +3619,7 @@
-     // For keepout zones, net code and net name are irrelevant, so we store a dummy value
-     // just for ZONE_CONTAINER compatibility
-     fprintf( m_fp,  "ZInfo %lX %d %s\n",
--                    me->GetTimeStamp(),
-+                    (u_long)me->GetTimeStamp(),
-                     me->GetIsKeepout() ? 0 : me->GetNet(),
-                     EscapedUTF8( me->GetIsKeepout() ? wxT("") : me->GetNetName() ).c_str() );
- 
-@@ -3737,7 +3737,7 @@
-     // this old keyword is used here for compatibility
-     fprintf( m_fp, "$COTATION\n" );
- 
--    fprintf( m_fp, "Ge %d %d %lX\n", me->GetShape(), me->GetLayer(), me->GetTimeStamp() );
-+    fprintf( m_fp, "Ge %d %d %lX\n", me->GetShape(), me->GetLayer(), (u_long)me->GetTimeStamp() );
- 
-     fprintf( m_fp, "Va %s\n", fmtBIU( me->m_Value ).c_str() );
- 
-@@ -3825,7 +3825,7 @@
-     fprintf( m_fp,  "De %d %d %lX %s",
-                     me->GetLayer(),
-                     !me->IsMirrored(),
--                    me->GetTimeStamp(),
-+                    (u_long)me->GetTimeStamp(),
-                     me->IsItalic() ? "Italic" : "Normal" );
- 
-     if( me->GetHorizJustify() != GR_TEXT_HJUSTIFY_CENTER ||
+--- pcbnew/legacy_plugin.cpp.orig	2015-12-11 18:15:36.000000000 +0100
++++ pcbnew/legacy_plugin.cpp	2015-12-11 18:17:49.000000000 +0100
+@@ -2327,7 +2327,7 @@
+ #endif

+ 

+         int         makeType;

+-        time_t      timeStamp;

++        u_long      timeStamp;

+         LAYER_NUM   layer_num;

+         int         type, net_code, flags_int;

+ 

+@@ -2810,7 +2810,7 @@
+         else if( TESTLINE( "Ge" ) )

+         {

+             LAYER_NUM layer_num;

+-            time_t  timestamp;

++            u_long  timestamp;

+             int     shape;

+             int     ilayer;

+ 

+@@ -3808,7 +3808,7 @@
+                     fmtDEG( orient ).c_str(),

+                     me->GetLayer(),

+                     me->GetLastEditTime(),

+-                    me->GetTimeStamp(),

++                    (u_long)me->GetTimeStamp(),

+                     statusTxt );

+ 

+     fprintf( m_fp, "Li %s\n", me->GetFPID().GetFootprintName().c_str() );

+@@ -3823,7 +3823,7 @@
+         fprintf( m_fp, "Kw %s\n", TO_UTF8( me->GetKeywords() ) );

+     }

+ 

+-    fprintf( m_fp, "Sc %lX\n", me->GetTimeStamp() );

++    fprintf( m_fp, "Sc %lX\n", (u_long)me->GetTimeStamp() );

+     fprintf( m_fp, "AR %s\n", TO_UTF8( me->GetPath() ) );

+     fprintf( m_fp, "Op %X %X 0\n", me->GetPlacementCost90(), me->GetPlacementCost180() );

+ 

+@@ -3904,7 +3904,7 @@
+              fmtBIUPoint( me->GetPosition() ).c_str(),

+              fmtBIU( me->GetSize() ).c_str(),

+              fmtBIU( me->GetWidth() ).c_str(),

+-             me->GetTimeStamp()

++             (u_long)me->GetTimeStamp()

+              );

+ 

+     fprintf( m_fp, "$EndPCB_TARGET\n" );

+@@ -3930,7 +3930,7 @@
+                  me->GetLayer(),

+                  me->GetType(),

+                  fmtDEG( me->GetAngle() ).c_str(),

+-                 me->GetTimeStamp(),

++                 (u_long)me->GetTimeStamp(),

+                  me->GetStatus()

+                  );

+     }

+@@ -3940,7 +3940,7 @@
+                  me->GetLayer(),

+                  me->GetType(),

+                  fmtDEG( me->GetAngle() ).c_str(),

+-                 me->GetTimeStamp(),

++                 (u_long)me->GetTimeStamp(),

+                  me->GetStatus(),

+                  fmtBIUPoint( me->GetBezControl1() ).c_str(),

+                  fmtBIUPoint( me->GetBezControl2() ).c_str()

+@@ -3975,7 +3975,7 @@
+ 

+     fprintf(m_fp, "De %d %d %d %lX %X\n",

+             me->GetLayer(), type, m_mapping->Translate( me->GetNetCode() ),

+-            me->GetTimeStamp(), me->GetStatus() );

++            (u_long)me->GetTimeStamp(), me->GetStatus() );

+ }

+ 

+ 

+@@ -3987,7 +3987,7 @@
+     // For keepout zones, net code and net name are irrelevant, so we store a dummy value

+     // just for ZONE_CONTAINER compatibility

+     fprintf( m_fp,  "ZInfo %lX %d %s\n",

+-                    me->GetTimeStamp(),

++                    (u_long)me->GetTimeStamp(),

+                     me->GetIsKeepout() ? 0 : m_mapping->Translate( me->GetNetCode() ),

+                     EscapedUTF8( me->GetIsKeepout() ? wxT("") : me->GetNetname() ).c_str() );

+ 

+@@ -4105,7 +4105,7 @@
+     // this old keyword is used here for compatibility

+     fprintf( m_fp, "$COTATION\n" );

+ 

+-    fprintf( m_fp, "Ge %d %d %lX\n", me->GetShape(), me->GetLayer(), me->GetTimeStamp() );

++    fprintf( m_fp, "Ge %d %d %lX\n", me->GetShape(), me->GetLayer(), (u_long)me->GetTimeStamp() );

+ 

+     fprintf( m_fp, "Va %s\n", fmtBIU( me->GetValue() ).c_str() );

+ 

+@@ -4193,7 +4193,7 @@
+     fprintf( m_fp,  "De %d %d %lX %s",

+                     me->GetLayer(),

+                     !me->IsMirrored(),

+-                    me->GetTimeStamp(),

++                    (u_long)me->GetTimeStamp(),

+                     me->IsItalic() ? "Italic" : "Normal" );

+ 

+     if( me->GetHorizJustify() != GR_TEXT_HJUSTIFY_CENTER ||

diff --git a/cad/kicad/patches/patch-pcbnew_xchgmod.cpp b/cad/kicad/patches/patch-pcbnew_xchgmod.cpp
index bddb0c62ec4..2677343b383 100644
--- a/cad/kicad/patches/patch-pcbnew_xchgmod.cpp
+++ b/cad/kicad/patches/patch-pcbnew_xchgmod.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-pcbnew_xchgmod.cpp,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
+$NetBSD: patch-pcbnew_xchgmod.cpp,v 1.2 2016/02/03 19:34:34 bouyer Exp $
 64bit time_t fix
 Reported upstream as bug id 1280901
 
---- pcbnew/xchgmod.cpp.orig	2014-02-15 15:52:55.000000000 +0100
-+++ pcbnew/xchgmod.cpp	2014-02-15 15:53:05.000000000 +0100
-@@ -649,7 +649,7 @@
-     for( ; Module != NULL; Module = Module->Next() )
-     {
-         fprintf( FichCmp, "\nBeginCmp\n" );
--        fprintf( FichCmp, "TimeStamp = %8.8lX\n", Module->GetTimeStamp() );
-+        fprintf( FichCmp, "TimeStamp = %8.8lX\n", (u_long)Module->GetTimeStamp() );
-         fprintf( FichCmp, "Path = %s\n", TO_UTF8( Module->m_Path ) );
-         fprintf( FichCmp, "Reference = %s;\n",
-                  !Module->m_Reference->m_Text.IsEmpty() ?
+--- pcbnew/xchgmod.cpp.orig	2015-12-11 18:20:54.000000000 +0100
++++ pcbnew/xchgmod.cpp	2015-12-11 18:21:01.000000000 +0100
+@@ -542,7 +542,7 @@
+     for( ; module != NULL; module = module->Next() )

+     {

+         fprintf( cmpFile, "\nBeginCmp\n" );

+-        fprintf( cmpFile, "TimeStamp = %8.8lX\n", module->GetTimeStamp() );

++        fprintf( cmpFile, "TimeStamp = %8.8lX\n", (u_long)module->GetTimeStamp() );

+         fprintf( cmpFile, "Path = %s\n", TO_UTF8( module->GetPath() ) );

+         fprintf( cmpFile, "Reference = %s;\n",

+                  !module->GetReference().IsEmpty() ?