- Update to r6904,

- set KICAD_BUILD_VERSION to DISTVERSION (as suggested by joerg@)
- Ignore FreeBSD releases < 10 or gcc builds for now since at least g++-48 doesn't seem to provide all needed math functions
  (like std::asinh ...) needed by GLM.

4 files changed, 75 insertions, 32 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 34280b472891..541642e7065d 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${BZR_SRC_REV}
-PORTREVISION=	1
+#PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/mr
 PKGNAMESUFFIX=	-devel
@@ -23,7 +23,7 @@ CONFLICTS=	kicad-2014*
 DOCVERSION=	1.1
 LIBVERSION=	1.0
 
-CXXFLAGS+=	-std=c++11
+#CXXFLAGS+=	-std=c++11
 USE_GL=		glew glu
 USE_WX=		3.0
 WX_COMPS=	wx
@@ -45,6 +45,7 @@ CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
+		-DKICAD_BUILD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DKICAD_SKIP_BOOST=YES
@@ -159,4 +160,10 @@ PLIST_DIR_LIST=		lib/kicad
 PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 			share/mimelnk
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000 || ${COMPILER_TYPE} == "gcc"
+  IGNORE= builds only on greater than 10 and with clang
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/cad/kicad-devel/Makefile.bzr_rev b/cad/kicad-devel/Makefile.bzr_rev
index 5e2b9ba287e5..1fdb7dd898e3 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=  6680
+BZR_SRC_REV=  6904
 BZR_LIB_REV=  
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index e060bf623678..84cb5b192c92 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kicad/kicad-r6680.tar.bz2) = 91e63f3c0c4470987e674157add071dff2664b23b408ad5ebe1ac1ae7f8aecdc
-SIZE (kicad/kicad-r6680.tar.bz2) = 91394239
+TIMESTAMP = 1465418419
+SHA256 (kicad/kicad-r6904.tar.bz2) = 4afc25cb2e290bf0632e546ed42d1a60fd987dad81ab8000da5aaff7ca773a25
+SIZE (kicad/kicad-r6904.tar.bz2) = 94165593
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 5b1cbb7a3fbb..30a0b89573ca 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -18,7 +18,7 @@ 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/bom2grouped_csv.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
@@ -44,62 +44,86 @@ lib/libkicad_3dsg.so.2.0.0
 %%PORTDOCS%%%%DOCSDIR%%/scripts/bom-in-python/kicad_netlist_reader.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/bom-in-python/round_robin.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/bom-in-python/round_value_robin.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/kicad-install.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/lib_convert.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/library-repos-install.bat
 %%PORTDOCS%%%%DOCSDIR%%/scripts/library-repos-install.sh
+%%PORTDOCS%%%%DOCSDIR%%/scripts/mk_mime_icons.py
 %%PORTDOCS%%%%DOCSDIR%%/scripts/osx_build_wx.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/osx_fixbundle.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/test_kicad_plugin.py
 %%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/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-eeschema-project.png
-share/icons/hicolor/128x128/mimetypes/application-x-gerbview-project.png
+share/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.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/128x128/mimetypes/application-x-kicad-schematic.png
+share/icons/hicolor/16x16/apps/bitmap2component.png
+share/icons/hicolor/16x16/apps/eeschema.png
+share/icons/hicolor/16x16/apps/gerbview.png
+share/icons/hicolor/16x16/apps/kicad.png
+share/icons/hicolor/16x16/apps/pcbcalculator.png
+share/icons/hicolor/16x16/apps/pcbnew.png
+share/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png
 share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png
+share/icons/hicolor/22x22/apps/bitmap2component.png
+share/icons/hicolor/22x22/apps/eeschema.png
+share/icons/hicolor/22x22/apps/gerbview.png
 share/icons/hicolor/22x22/apps/kicad.png
+share/icons/hicolor/22x22/apps/pcbcalculator.png
+share/icons/hicolor/22x22/apps/pcbnew.png
+share/icons/hicolor/22x22/mimetypes/application-x-kicad-pcb.png
 share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/22x22/mimetypes/application-x-kicad-schematic.png
+share/icons/hicolor/24x24/apps/bitmap2component.png
+share/icons/hicolor/24x24/apps/eeschema.png
+share/icons/hicolor/24x24/apps/gerbview.png
 share/icons/hicolor/24x24/apps/kicad.png
+share/icons/hicolor/24x24/apps/pcbcalculator.png
+share/icons/hicolor/24x24/apps/pcbnew.png
+share/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png
 share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png
+share/icons/hicolor/32x32/apps/bitmap2component.png
+share/icons/hicolor/32x32/apps/eeschema.png
+share/icons/hicolor/32x32/apps/gerbview.png
 share/icons/hicolor/32x32/apps/kicad.png
+share/icons/hicolor/32x32/apps/pcbcalculator.png
+share/icons/hicolor/32x32/apps/pcbnew.png
+share/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png
 share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.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-eeschema-project.png
-share/icons/hicolor/48x48/mimetypes/application-x-gerbview-project.png
+share/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.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/48x48/mimetypes/application-x-kicad-schematic.png
+share/icons/hicolor/64x64/apps/bitmap2component.png
+share/icons/hicolor/64x64/apps/eeschema.png
+share/icons/hicolor/64x64/apps/gerbview.png
+share/icons/hicolor/64x64/apps/kicad.png
+share/icons/hicolor/64x64/apps/pcbcalculator.png
+share/icons/hicolor/64x64/apps/pcbnew.png
+share/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png
+share/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png
+share/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png
 share/icons/hicolor/scalable/apps/bitmap2component.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-eeschema-project.svg
-share/icons/hicolor/scalable/mimetypes/application-x-gerbview-project.svg
+share/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.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/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/complex_hierarchy/ampli_ht.sch
 %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy-cache.lib
 %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.kicad_pcb
@@ -320,6 +344,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/battery_management.dcm
+%%DATADIR%%/library/battery_management.lib
 %%DATADIR%%/library/bbd.dcm
 %%DATADIR%%/library/bbd.lib
 %%DATADIR%%/library/brooktre.dcm
@@ -1127,6 +1153,17 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%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/Connectors_Samtec.3dshapes/LSHM-120-xxx-x-DV-A-N.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-120-xxx-x-DV-A-S.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-130-xxx-x-DV-A-N.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-130-xxx-x-DV-A-S.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-140-xxx-x-DV-A-N.wrl
+%%DATADIR%%/modules/packages3d/Connectors_Samtec.3dshapes/LSHM-140-xxx-x-DV-A-S.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-146.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-156.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-306.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-405.wrl
+%%DATADIR%%/modules/packages3d/Crystals.3dshapes/Crystal_MC-406.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
@@ -4278,7 +4315,5 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg
 %%DATADIR%%/template/ti-stellaris-boosterpack40_min/meta/icon.png
 %%DATADIR%%/template/ti-stellaris-boosterpack40_min/meta/info.html
 %%DATADIR%%/template/ti-stellaris-boosterpack40_min/meta/launchpad_standard40.png
-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
+share/mime/packages/kicad-gerbers.xml
+share/mime/packages/kicad-kicad.xml