6 files changed, 103 insertions, 68 deletions

diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index d14aab5457ca..8715754c08e3 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	kicad
-PORTVERSION=	6.0.11
+PORTVERSION=	7.0.0
 PORTEPOCH=	2
 CATEGORIES=	cad
-MASTER_SITES=	https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}/
+MASTER_SITES=	https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Schematic and PCB editing software
@@ -19,12 +19,13 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 		libpixman-1.so:x11/pixman		\
 		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl			\
-		libGLEW-wayland.so:graphics/glew-wayland
-
-CONFLICTS_INSTALL=	kicad-devel # bin/_cvpcb.kiface
+		libGLEW-wayland.so:graphics/glew-wayland \
+		libfreetype.so:print/freetype2	\
+		libfontconfig.so:x11-fonts/fontconfig	\
+		libodbc.so:databases/unixODBC
 
 USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl \
-		gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \
+		gnome pkgconfig python:3.5+ shared-mime-info shebangfix \
 		tar:bz2 xorg
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
@@ -33,35 +34,34 @@ USE_GL=		gl glu glut
 USE_WX=		3.2
 WX_COMPS=	python:lib wx
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 pango
-CXXFLAGS+=	--std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include
+CXXFLAGS+=	-std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include
+# not using "bundled glew" breaks the 3d viewer
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}	\
 		-DwxWidgets_USE_UNICODE=ON			\
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD}		\
 		-DKICAD_SCRIPTING_WXPYTHON=ON			\
-		-DKICAD_USE_OCC=ON				\
 		-DKICAD_USE_EGL=ON				\
 		-DKICAD_USE_BUNDLED_GLEW=ON 			\
+		-DNANODBC_ENABLE_BOOST=ON			\
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
+CMAKE_ENV+=	DODBC_PATH=${LOCALBASE}
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
-OPTIONS_DEFINE=	DOCS DOXYGEN NLS
+OPTIONS_DEFINE=	DOXYGEN NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 DOXYGEN_VARS=	LICENSE+=GFDL LICENSE_COMB=multi
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
-DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_ALL_TARGET=	all doxygen-docs
-DOXYGEN_PORTDOCS=	doxygen
+
+CONFLICTS_INSTALL=	kicad-devel # bin/_cvpcb.kiface
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
-post-install-DOCS-on:
-	(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-
 .include <bsd.port.mk>
diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
index 58370d3ddf2d..712d75f94c93 100644
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674662488
-SHA256 (kicad-6.0.11.tar.bz2) = f2b7ad72942c7e154bebb06d4e6d9fd7ea765f679edafb25b059b387860fbe5d
-SIZE (kicad-6.0.11.tar.bz2) = 34083016
+TIMESTAMP = 1676192389
+SHA256 (kicad-7.0.0.tar.bz2) = f0e188c67a1044c6cc884b66b25717326d93ec896194c0963c2fb79b35943d72
+SIZE (kicad-7.0.0.tar.bz2) = 42583715
diff --git a/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake b/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake
index 5700ecb29817..654deae40d10 100644
--- a/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake
+++ b/cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake
@@ -1,11 +1,11 @@
---- CMakeModules/KiCadFullVersion.cmake.orig	2022-01-17 23:51:27 UTC
-+++ CMakeModules/KiCadFullVersion.cmake
+--- ./cmake/KiCadFullVersion.cmake.orig	2023-01-25 21:49:08.004539000 +0100
++++ ./cmake/KiCadFullVersion.cmake	2023-01-25 21:49:50.772285000 +0100
 @@ -27,10 +27,6 @@
  # repository), or the version from KiCadVersion.cmake. The user-provided
  # KICAD_VERSION_EXTRA is then appended to the base version string.
  
 -# Use git to determine the version string if it's available.
--include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
+-include( ${KICAD_CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
 -create_git_version_header( ${SRC_PATH} )
 -
  # $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
diff --git a/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp b/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
index a7b40f4b3256..ba2c5ec1a4dd 100644
--- a/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
+++ b/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
@@ -1,23 +1,11 @@
---- eeschema/sim/sim_plot_frame.cpp.orig	2022-09-14 16:35:24 UTC
-+++ eeschema/sim/sim_plot_frame.cpp
-@@ -167,15 +167,15 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindo
-     Bind( EVT_SIM_CURSOR_UPDATE, &SIM_PLOT_FRAME::onCursorUpdate, this );
+--- eeschema/sim/sim_plot_frame.cpp.orig	2023-01-25 22:50:55.894239000 +0100
++++ eeschema/sim/sim_plot_frame.cpp	2023-01-27 00:25:46.086158000 +0100
+@@ -27,6 +27,8 @@
+ #include <wx/debug.h>
+ #include <wx/stc/stc.h>
  
-     // Toolbar buttons
--    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _( "Run/Stop Simulation" ),
-+    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, wxEmptyString,
-             KiBitmap( BITMAPS::sim_run ), _( "Run Simulation" ), wxITEM_NORMAL );
--    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _( "Add Signals" ),
-+    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, wxEmptyString,
-             KiBitmap( BITMAPS::sim_add_signal ), _( "Add signals to plot" ), wxITEM_NORMAL );
--    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  _( "Probe" ),
-+    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  wxEmptyString,
-             KiBitmap( BITMAPS::sim_probe ), _( "Probe signals on the schematic" ), wxITEM_NORMAL );
--    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _( "Tune" ),
-+    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, wxEmptyString,
-             KiBitmap( BITMAPS::sim_tune ), _( "Tune component values" ), wxITEM_NORMAL );
--    m_toolSettings = m_toolBar->AddTool( wxID_ANY, _( "Sim Parameters" ),
-+    m_toolSettings = m_toolBar->AddTool( wxID_ANY, wxEmptyString,
-             KiBitmap( BITMAPS::config ), _( "Simulation parameters and settings" ), wxITEM_NORMAL );
- 
-     // Start all toolbar buttons except settings as disabled
++#undef WXWIN_COMPATIBILITY_2_8
++
+ // For some obscure reason, needed on msys2 with some wxWidgets versions (3.0) to avoid
+ // undefined symbol at link stage (due to use of #include <pegtl.hpp>)
+ // Should not create issues on other platforms
diff --git a/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp b/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
new file mode 100644
index 000000000000..aee69e61ffff
--- /dev/null
+++ b/cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
@@ -0,0 +1,50 @@
+--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig	2023-01-25 22:16:35.742131000 +0100
++++ pcbnew/import_gfx/dxf_import_plugin.cpp	2023-01-25 23:02:52.939723000 +0100
+@@ -28,6 +28,9 @@
+ // like void DXF_IMPORT_PLUGIN::addLine( const DL_LineData& data ) when a line is read.
+ // this function just add the BOARD entity from dxf parameters (start and end point ...)
+ 
++#ifdef __BSD_VISIBLE
++#undef __BSD_VISIBLE
++#endif
+ 
+ #include "dxf_import_plugin.h"
+ #include <wx/arrstr.h>
+@@ -580,7 +583,7 @@
+     // For now, we assume ellipses in the XY plane.
+ 
+     VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
+-    VECTOR2D major( mapX( majorCoords.x ), mapY( majorCoords.y ) );
++    VECTOR2D vmajor( mapX( majorCoords.x ), mapY( majorCoords.y ) );
+ 
+     // DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees)
+     // The arcs wind CCW as in KiCad.  The end angle must be greater than the start angle, and if
+@@ -598,7 +601,7 @@
+ 
+     if( aData.ratio == 1.0 )
+     {
+-        double radius = major.EuclideanNorm();
++        double radius = vmajor.EuclideanNorm();
+ 
+         if( startAngle == endAngle )
+         {
+@@ -616,7 +619,7 @@
+     }
+ 
+     std::vector<BEZIER<double>> splines;
+-    ELLIPSE<double> ellipse( center, major, aData.ratio, startAngle, endAngle );
++    ELLIPSE<double> ellipse( center, vmajor, aData.ratio, startAngle, endAngle );
+ 
+     TransformEllipseToBeziers( ellipse, splines );
+ 
+@@ -630,8 +633,8 @@
+         bufferToUse->AddSpline( b.Start, b.C1, b.C2, b.End, lineWidth );
+ 
+     // Naive bounding
+-    updateImageLimits( center + major );
+-    updateImageLimits( center - major );
++    updateImageLimits( center + vmajor );
++    updateImageLimits( center - vmajor );
+ }
+ 
+ 
diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist
index 3df317ff5d37..fa6f49dbdade 100644
--- a/cad/kicad/pkg-plist
+++ b/cad/kicad/pkg-plist
@@ -13,7 +13,7 @@ bin/idf2vrml
 bin/idfcyl
 bin/idfrect
 bin/kicad
-bin/kicad2step
+bin/kicad-cli
 bin/pcb_calculator
 bin/pcbnew
 bin/pl_editor
@@ -30,23 +30,6 @@ lib/libkicad_3dsg.so.2.0.0
 %%DESKTOPDIR%%/org.kicad.kicad.desktop
 %%DESKTOPDIR%%/org.kicad.pcbcalculator.desktop
 %%DESKTOPDIR%%/org.kicad.pcbnew.desktop
-%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2007.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2008.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2009.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2010.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2011.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2012.txt
-%%PORTDOCS%%%%DOCSDIR%%/docset/CMakeLists.txt
-%%PORTDOCS%%%%DOCSDIR%%/docset/icon-16.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.Dockerfile
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.Dockerfile.dockerignore
-%%PORTDOCS%%%%DOCSDIR%%/eagle-plugin-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/kicad_doxygen_logo.png
-%%PORTDOCS%%%%DOCSDIR%%/notes_about_pcbnew_new_file_format.odt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/lib_convert.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/test_kicad_plugin.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/test_plugin.py
 share/icons/hicolor/128x128/apps/bitmap2component.png
 share/icons/hicolor/128x128/apps/eeschema.png
 share/icons/hicolor/128x128/apps/gerbview.png
@@ -130,6 +113,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_pro
 %%DATADIR%%/demos/ecc83/ecc83-pp_v2.kicad_sch
 %%DATADIR%%/demos/ecc83/ecc83_schlib.kicad_sym
+%%DATADIR%%/demos/ecc83/footprints.pretty/MountingHole_3.2mm_M3_DIN965_Pad.kicad_mod
+%%DATADIR%%/demos/ecc83/footprints.pretty/Valve_ECC-83-1.kicad_mod
+%%DATADIR%%/demos/ecc83/footprints.pretty/Valve_ECC-83-2.kicad_mod
 %%DATADIR%%/demos/ecc83/fp-lib-table
 %%DATADIR%%/demos/ecc83/sym-lib-table
 %%DATADIR%%/demos/electric/elec-unifil.kicad_sym
@@ -142,7 +128,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/flat_hierarchy/fp-lib-table
 %%DATADIR%%/demos/flat_hierarchy/libs/3d_shapes/adjustable_rx2v4.wrl
 %%DATADIR%%/demos/flat_hierarchy/libs/flat_hierarchy_schlib.kicad_sym
+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/D_DO-35_SOD27_P7.62mm_Horizontal.kicad_mod
+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/MountingHole_4.3mm_M4_DIN965.kicad_mod
 %%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod
+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.kicad_mod
+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/TO-220-3_Horizontal_TabDown.kicad_mod
+%%DATADIR%%/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/TO-92.kicad_mod
 %%DATADIR%%/demos/flat_hierarchy/pic_programmer.kicad_sch
 %%DATADIR%%/demos/flat_hierarchy/pic_sockets.kicad_sch
 %%DATADIR%%/demos/flat_hierarchy/sym-lib-table
@@ -152,11 +143,11 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/interf_u/interf_u.kicad_sch
 %%DATADIR%%/demos/interf_u/interf_u.pretty/BUS_PC.kicad_mod
 %%DATADIR%%/demos/interf_u/interf_u.pretty/PGA120.kicad_mod
+%%DATADIR%%/demos/interf_u/interf_u.pretty/tux.kicad_mod
 %%DATADIR%%/demos/interf_u/interf_u_schlib.kicad_sym
 %%DATADIR%%/demos/interf_u/pagelayout_logo.kicad_wks
 %%DATADIR%%/demos/interf_u/sym-lib-table
 %%DATADIR%%/demos/interf_u/tux.bmp
-%%DATADIR%%/demos/interf_u/tux.kicad_mod
 %%DATADIR%%/demos/interf_u/tux.kicad_sym
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/fp-lib-table
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.kicad_sch
@@ -220,6 +211,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/simulation/sallen_key/sallen_key.kicad_sch
 %%DATADIR%%/demos/simulation/sallen_key/sallen_key_schlib.kicad_sym
 %%DATADIR%%/demos/simulation/sallen_key/sym-lib-table
+%%DATADIR%%/demos/simulation/subsheets/subsheet1.kicad_sch
+%%DATADIR%%/demos/simulation/subsheets/subsheet2.kicad_sch
+%%DATADIR%%/demos/simulation/subsheets/subsheets.kicad_sch
 %%DATADIR%%/demos/simulation/v_i_sources/sym-lib-table
 %%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_pro
 %%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_sch
@@ -260,6 +254,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/stickhub/footprints.pretty/USB_A_PCB_traces_small.kicad_mod
 %%DATADIR%%/demos/stickhub/fp-lib-table
 %%DATADIR%%/demos/stickhub/sym-lib-table
+%%DATADIR%%/demos/test_pads_inside_pads/connect.pretty/1pin.kicad_mod
+%%DATADIR%%/demos/test_pads_inside_pads/connect.pretty/1pin_thermal.kicad_mod
+%%DATADIR%%/demos/test_pads_inside_pads/fp-lib-table
 %%DATADIR%%/demos/test_pads_inside_pads/sym-lib-table
 %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb
 %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro
@@ -269,17 +266,23 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/test_xil_95108/carte_test.kicad_pro
 %%DATADIR%%/demos/test_xil_95108/carte_test.kicad_sch
 %%DATADIR%%/demos/test_xil_95108/carte_test_schlib.kicad_sym
+%%DATADIR%%/demos/test_xil_95108/footprints.pretty/DIP-28__300__600_ELL.kicad_mod
+%%DATADIR%%/demos/test_xil_95108/footprints.pretty/PLCC84.kicad_mod
 %%DATADIR%%/demos/test_xil_95108/fp-lib-table
 %%DATADIR%%/demos/test_xil_95108/sym-lib-table
 %%DATADIR%%/demos/video/bus_pci.kicad_sch
 %%DATADIR%%/demos/video/esvideo.kicad_sch
 %%DATADIR%%/demos/video/fp-lib-table
 %%DATADIR%%/demos/video/graphic.kicad_sch
+%%DATADIR%%/demos/video/libs/footprints.pretty/BUSPCI.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/CV3-30PF.kicad_mod
+%%DATADIR%%/demos/video/libs/footprints.pretty/D_DO-34_SOD68_P7.62mm_Horizontal.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/LED_D3.0mm.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/LRTDK.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/PLCC68.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/PLCC84.kicad_mod
+%%DATADIR%%/demos/video/libs/footprints.pretty/SOT23EBC.kicad_mod
+%%DATADIR%%/demos/video/libs/footprints.pretty/SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/sim72.kicad_mod
 %%DATADIR%%/demos/video/libs/footprints.pretty/subclick.kicad_mod
 %%DATADIR%%/demos/video/libs/fp.3dshapes/subclick_horiz.wings
@@ -294,21 +297,15 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/video/video.kicad_pro
 %%DATADIR%%/demos/video/video.kicad_sch
 %%DATADIR%%/plugins/README-bom.txt
-%%DATADIR%%/plugins/bom2csv.xsl
-%%DATADIR%%/plugins/bom2grouped_csv.xsl
 %%DATADIR%%/plugins/bom_csv_grouped_by_value.py
 %%DATADIR%%/plugins/bom_csv_grouped_by_value_with_fp.py
+%%DATADIR%%/plugins/bom_csv_grouped_extra.py
 %%DATADIR%%/plugins/bom_csv_sorted_by_ref.py
 %%DATADIR%%/plugins/bom_html_grouped_by_value.py
 %%DATADIR%%/plugins/bom_html_with_advanced_grouping.py
 %%DATADIR%%/plugins/bom_txt_sorted_by_ref.py
-%%DATADIR%%/plugins/bom_with_title_block_2_csv.xsl
 %%DATADIR%%/plugins/kicad_netlist_reader.py
 %%DATADIR%%/plugins/kicad_utils.py
-%%DATADIR%%/plugins/netlist_form_OrcadPcb2.xsl
-%%DATADIR%%/plugins/netlist_form_cadstar-RINF.xsl
-%%DATADIR%%/plugins/netlist_form_cadstar.xsl
-%%DATADIR%%/plugins/netlist_form_pads-pcb.asc.xsl
 %%DATADIR%%/resources/images.tar.gz
 %%DATADIR%%/schemas/pcm.v1.schema.json
 %%DATADIR%%/scripting/kicad_pyshell/__init__.py