pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/cad/kicad
Module Name: pkgsrc
Committed By: tnn
Date: Sun Jan 2 19:10:03 UTC 2022
Modified Files:
pkgsrc/cad/kicad: Makefile PLIST distinfo
pkgsrc/cad/kicad/patches: patch-3d-viewer_3d_cache_sg_CMakeLists.txt
patch-CMakeLists.txt patch-CMakeModules_Functions.cmake
patch-CMakeModules_KiCadFullVersion.cmake
patch-common_CMakeLists.txt patch-common_lib__tree__model.cpp
patch-cvpcb_CMakeLists.txt patch-eeschema_CMakeLists.txt
patch-gerbview_CMakeLists.txt patch-pcbnew_CMakeLists.txt
patch-plugins_3d_idf_CMakeLists.txt
patch-plugins_3d_vrml_CMakeLists.txt
Added Files:
pkgsrc/cad/kicad/patches:
patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake
patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake
patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake
patch-CMakeModules_WritePlatformMetadata__macos.cmake
patch-Documentation_docset_CMakeLists.txt
patch-bitmaps__png_CMakeLists.txt patch-kicad_CMakeLists.txt
patch-pagelayout__editor_CMakeLists.txt
patch-pcb__calculator_CMakeLists.txt patch-resources_CMakeLists.txt
patch-thirdparty_libcontext_libcontext.h
Removed Files:
pkgsrc/cad/kicad/patches:
patch-CMakeModules_WritePlatformMetadata_linux.cmake
patch-CMakeModules_WriteVersionHeader.cmake
patch-bitmaps_png_CMakeLists.txt patch-include_hashtables.h
patch-include_system_libcontext.h
patch-pagelayout_editor_CMakeLists.txt
patch-pcb_calculator_CMakeLists.txt
Log Message:
kicad: update to 6.0.0
XXXTNN package phase is broken on macOS due to app bundling changes.
Extensive CMake surgery required. Will fix this in a follow-up commit.
New in 6.0:
- Modern, consistent look and feel
KiCad 6.0 features a refreshed user interface designed to reduce the
barriers of entry for new users
- Upgraded schematic editing
KiCad's schematic editor has received its biggest overhaul ever for
version 6.0
- Improved PCB design experience
KiCad's PCB editor has had a complete look and feel upgrade
The following features are deprecated as of version 6.0:
XSLT BOM generation scripts
The SWIG Python API
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/cad/kicad/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/cad/kicad/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/cad/kicad/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists.txt
cvs rdiff -u -r1.5 -r1.6 pkgsrc/cad/kicad/patches/patch-CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-eeschema_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake \
pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake \
pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake \
pkgsrc/cad/kicad/patches/patch-CMakeModules_WritePlatformMetadata__macos.cmake \
pkgsrc/cad/kicad/patches/patch-Documentation_docset_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-bitmaps__png_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-kicad_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-pagelayout__editor_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-pcb__calculator_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-resources_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-thirdparty_libcontext_libcontext.h
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/cad/kicad/patches/patch-CMakeModules_Functions.cmake \
pkgsrc/cad/kicad/patches/patch-common_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-cvpcb_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-pcbnew_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/cad/kicad/patches/patch-CMakeModules_KiCadFullVersion.cmake \
pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp \
pkgsrc/cad/kicad/patches/patch-plugins_3d_idf_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-plugins_3d_vrml_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
pkgsrc/cad/kicad/patches/patch-CMakeModules_WritePlatformMetadata_linux.cmake \
pkgsrc/cad/kicad/patches/patch-include_system_libcontext.h
cvs rdiff -u -r1.5 -r0 \
pkgsrc/cad/kicad/patches/patch-CMakeModules_WriteVersionHeader.cmake
cvs rdiff -u -r1.3 -r0 \
pkgsrc/cad/kicad/patches/patch-bitmaps_png_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-include_hashtables.h \
pkgsrc/cad/kicad/patches/patch-pagelayout_editor_CMakeLists.txt \
pkgsrc/cad/kicad/patches/patch-pcb_calculator_CMakeLists.txt
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/cad/kicad/patches/patch-gerbview_CMakeLists.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/cad/kicad/Makefile
diff -u pkgsrc/cad/kicad/Makefile:1.56 pkgsrc/cad/kicad/Makefile:1.57
--- pkgsrc/cad/kicad/Makefile:1.56 Wed Dec 8 16:03:25 2021
+++ pkgsrc/cad/kicad/Makefile Sun Jan 2 19:10:03 2022
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2021/12/08 16:03:25 adam Exp $
+# $NetBSD: Makefile,v 1.57 2022/01/02 19:10:03 tnn Exp $
#
-V= 5.1.10
+V= 6.0.0
DISTNAME= kicad-${V}
-PKGREVISION= 2
CATEGORIES= cad
MASTER_SITES= https://gitlab.com/kicad/code/kicad/-/archive/${V}/
EXTRACT_SUFX= .tar.bz2
@@ -13,6 +12,7 @@ HOMEPAGE= https://www.kicad.org/
COMMENT= Schematic and PCB CAD software (stable branch)
LICENSE= gnu-gpl-v3
+BUILD_DEPENDS+= swig3-[0-9]*:../../devel/swig3
DEPENDS+= git-base-[0-9]*:../../devel/git-base
USE_PKGLOCALEDIR= yes
@@ -20,47 +20,23 @@ USE_LANGUAGES= c c++11
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON
-CMAKE_ARGS+= -DKICAD_SPICE=OFF -DKICAD_USE_OCE=OFF
-CMAKE_ARGS+= -DKICAD_SCRIPTING=OFF -DKICAD_SCRIPTING_MODULES=OFF
-CMAKE_ARGS+= -DKICAD_SCRIPTING_ACTION_MENU=OFF
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+= -DKICAD_SPICE=OFF
CMAKE_ARGS+= -DKICAD_SCRIPTING_WXPYTHON=OFF
+CMAKE_ARGS+= -DKICAD_USE_OCC=OFF # pkgsrc/cad/oce, but it is too old
+CMAKE_ARGS+= -DKICAD_BUILD_I18N=ON
CMAKE_MODULE_PATH_OVERRIDE= \
new/CMakeLists.txt
PY_PATCHPLIST= yes
-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 \
- kicad/CMakeLists.txt
-SUBST_SED.macosx= -e 's/[[:<:]]MACOSX_BUNDLE[[:>:]]//'
-
-.include "../../mk/bsd.prefs.mk"
-
-# PR 48980: no fabsl on netbsd-5
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
-SUBST_CLASSES+= netbsd5
-SUBST_STAGE.netbsd5= post-extract
-SUBST_MESSAGE.netbsd5= Substituting fabs() for fabsl() for NetBSD-5
-SUBST_FILES.netbsd5= pcbnew/legacy_plugin.cpp \
- tools/test-nm-biu-to-ascii-mm-round-tripping.cpp
-SUBST_SED.netbsd5= -e 's/fabsl/fabs/g'
-.endif
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+= -Wno-error=non-pod-varargs
-.endif
-
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/cmake/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glew/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glm+= glm>=0.9.9.8
.include "../../graphics/glm/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
Index: pkgsrc/cad/kicad/PLIST
diff -u pkgsrc/cad/kicad/PLIST:1.6 pkgsrc/cad/kicad/PLIST:1.7
--- pkgsrc/cad/kicad/PLIST:1.6 Fri Jul 30 22:47:18 2021
+++ pkgsrc/cad/kicad/PLIST Sun Jan 2 19:10:03 2022
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2021/07/30 22:47:18 tnn Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/01/02 19:10:03 tnn Exp $
bin/_cvpcb.kiface
bin/_eeschema.kiface
bin/_gerbview.kiface
+bin/_kipython.kiface
bin/_pcb_calculator.kiface
bin/_pcbnew.kiface
bin/_pl_editor.kiface
@@ -20,14 +21,14 @@ lib/kicad/plugins/3d/libs3d_plugin_idf.s
lib/kicad/plugins/3d/libs3d_plugin_vrml.so
lib/libkicad_3dsg.so
lib/libkicad_3dsg.so.2.0.0
-share/appdata/kicad.appdata.xml
-share/applications/bitmap2component.desktop
-share/applications/eeschema.desktop
-share/applications/gerbview.desktop
-share/applications/kicad.desktop
-share/applications/pcbcalculator.desktop
-share/applications/pcbnew.desktop
-share/doc/kicad/scripts/ddr3_length_match.py
+${PYSITELIB}/_pcbnew.so
+${PYSITELIB}/pcbnew.py
+share/applications/org.kicad.bitmap2component.desktop
+share/applications/org.kicad.eeschema.desktop
+share/applications/org.kicad.gerbview.desktop
+share/applications/org.kicad.kicad.desktop
+share/applications/org.kicad.pcbcalculator.desktop
+share/applications/org.kicad.pcbnew.desktop
share/doc/kicad/scripts/lib_convert.py
share/doc/kicad/scripts/test_kicad_plugin.py
share/doc/kicad/scripts/test_plugin.py
@@ -49,15 +50,6 @@ share/icons/hicolor/16x16/apps/pcbnew.pn
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
@@ -103,77 +95,67 @@ share/icons/hicolor/scalable/apps/pcbnew
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-kicad-schematic.svg
-share/kicad/demos/complex_hierarchy/ampli_ht.sch
-share/kicad/demos/complex_hierarchy/complex_hierarchy-cache.lib
+share/kicad/demos/complex_hierarchy/ampli_ht.kicad_sch
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/complex_hierarchy/complex_hierarchy.kicad_pro
+share/kicad/demos/complex_hierarchy/complex_hierarchy.kicad_sch
+share/kicad/demos/complex_hierarchy/complex_hierarchy_schlib.kicad_sym
share/kicad/demos/complex_hierarchy/fp-lib-table
share/kicad/demos/complex_hierarchy/sym-lib-table
-share/kicad/demos/custom_pads_test/custom_pads_schlib.dcm
-share/kicad/demos/custom_pads_test/custom_pads_schlib.lib
-share/kicad/demos/custom_pads_test/custom_pads_test-cache.lib
+share/kicad/demos/custom_pads_test/custom_pads_schlib.kicad_sym
share/kicad/demos/custom_pads_test/custom_pads_test.kicad_pcb
-share/kicad/demos/custom_pads_test/custom_pads_test.lib
-share/kicad/demos/custom_pads_test/custom_pads_test.net
-share/kicad/demos/custom_pads_test/custom_pads_test.pro
-share/kicad/demos/custom_pads_test/custom_pads_test.sch
+share/kicad/demos/custom_pads_test/custom_pads_test.kicad_pro
+share/kicad/demos/custom_pads_test/custom_pads_test.kicad_sch
share/kicad/demos/custom_pads_test/sym-lib-table
-share/kicad/demos/ecc83/ecc83-pp-cache.lib
+share/kicad/demos/ecc83/3d_shapes/ecc83.wrl
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.kicad_pro
+share/kicad/demos/ecc83/ecc83-pp.kicad_sch
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/ecc83-pp_v2.kicad_pro
+share/kicad/demos/ecc83/ecc83-pp_v2.kicad_sch
+share/kicad/demos/ecc83/ecc83_schlib.kicad_sym
share/kicad/demos/ecc83/fp-lib-table
share/kicad/demos/ecc83/sym-lib-table
-share/kicad/demos/electric/elec-unifil.dcm
-share/kicad/demos/electric/elec-unifil.lib
-share/kicad/demos/electric/electric-cache.lib
-share/kicad/demos/electric/electric.pro
-share/kicad/demos/electric/electric.sch
+share/kicad/demos/electric/elec-unifil.kicad_sym
+share/kicad/demos/electric/electric.kicad_pro
+share/kicad/demos/electric/electric.kicad_sch
share/kicad/demos/electric/sym-lib-table
-share/kicad/demos/flat_hierarchy/flat_hierarchy-cache.lib
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/flat_hierarchy/flat_hierarchy.kicad_pro
+share/kicad/demos/flat_hierarchy/flat_hierarchy.kicad_sch
+share/kicad/demos/flat_hierarchy/fp-lib-table
+share/kicad/demos/flat_hierarchy/libs/3d_shapes/adjustable_rx2v4.wrl
+share/kicad/demos/flat_hierarchy/libs/flat_hierarchy_schlib.kicad_sym
+share/kicad/demos/flat_hierarchy/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod
+share/kicad/demos/flat_hierarchy/pic_programmer.kicad_sch
+share/kicad/demos/flat_hierarchy/pic_sockets.kicad_sch
share/kicad/demos/flat_hierarchy/sym-lib-table
share/kicad/demos/interf_u/fp-lib-table
-share/kicad/demos/interf_u/interf_u-cache.lib
share/kicad/demos/interf_u/interf_u.kicad_pcb
-share/kicad/demos/interf_u/interf_u.net
+share/kicad/demos/interf_u/interf_u.kicad_pro
+share/kicad/demos/interf_u/interf_u.kicad_sch
share/kicad/demos/interf_u/interf_u.pretty/BUS_PC.kicad_mod
share/kicad/demos/interf_u/interf_u.pretty/PGA120.kicad_mod
-share/kicad/demos/interf_u/interf_u.pro
-share/kicad/demos/interf_u/interf_u.sch
-share/kicad/demos/interf_u/interf_u_schlib.dcm
-share/kicad/demos/interf_u/interf_u_schlib.lib
+share/kicad/demos/interf_u/interf_u_schlib.kicad_sym
share/kicad/demos/interf_u/pagelayout_logo.kicad_wks
share/kicad/demos/interf_u/sym-lib-table
share/kicad/demos/interf_u/tux.bmp
share/kicad/demos/interf_u/tux.kicad_mod
-share/kicad/demos/interf_u/tux.lib
+share/kicad/demos/interf_u/tux.kicad_sym
share/kicad/demos/kit-dev-coldfire-xilinx_5213/fp-lib-table
-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.lib
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.kicad_sch
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-coldfire_schlib.kicad_sym
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.dcm
-share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pro
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_sch
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/FSUPCMS.kicad_mod
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/JACK_ALIM.kicad_mod
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/SM1206POL.kicad_mod
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/SOT23EBC.kicad_mod
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/SOT353.kicad_mod
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/SW_PUSH_SMALL.kicad_mod
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire.pretty/SW_SPDT.kicad_mod
share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings
share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl
share/kicad/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Jack.wings
@@ -182,22 +164,20 @@ share/kicad/demos/kit-dev-coldfire-xilin
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/sym-lib-table
-share/kicad/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
+share/kicad/demos/kit-dev-coldfire-xilinx_5213/xilinx.kicad_sch
share/kicad/demos/microwave/microwave.kicad_pcb
-share/kicad/demos/microwave/microwave.pro
+share/kicad/demos/microwave/microwave.kicad_pro
share/kicad/demos/microwave/shape1.txt
share/kicad/demos/pic_programmer/fp-lib-table
+share/kicad/demos/pic_programmer/libs/3d_shapes/adjustable_rx2v4.wrl
+share/kicad/demos/pic_programmer/libs/3d_shapes/textool_40.wrl
share/kicad/demos/pic_programmer/libs/pic_programmer_fp.pretty/40tex-Ell600.kicad_mod
share/kicad/demos/pic_programmer/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod
-share/kicad/demos/pic_programmer/libs/pic_programmer_fp.pretty/TO-92_BC237_307.kicad_mod
-share/kicad/demos/pic_programmer/libs/pic_programmer_schlib.dcm
-share/kicad/demos/pic_programmer/libs/pic_programmer_schlib.lib
-share/kicad/demos/pic_programmer/pic_programmer-cache.lib
+share/kicad/demos/pic_programmer/libs/pic_programmer_schlib.kicad_sym
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
-share/kicad/demos/pic_programmer/pic_programmer.sch
-share/kicad/demos/pic_programmer/pic_sockets.sch
+share/kicad/demos/pic_programmer/pic_programmer.kicad_pro
+share/kicad/demos/pic_programmer/pic_programmer.kicad_sch
+share/kicad/demos/pic_programmer/pic_sockets.kicad_sch
share/kicad/demos/pic_programmer/sym-lib-table
share/kicad/demos/python_scripts_examples/action_menu_add_automatic_border.py
share/kicad/demos/python_scripts_examples/action_menu_text_by_date.py
@@ -207,73 +187,131 @@ share/kicad/demos/python_scripts_example
share/kicad/demos/simulation/laser_driver/ad8009.lib
share/kicad/demos/simulation/laser_driver/fzt1049a.lib
share/kicad/demos/simulation/laser_driver/laser.lib
-share/kicad/demos/simulation/laser_driver/laser_driver-cache.lib
-share/kicad/demos/simulation/laser_driver/laser_driver.pro
-share/kicad/demos/simulation/laser_driver/laser_driver.sch
-share/kicad/demos/simulation/laser_driver/laser_driver_schlib.lib
+share/kicad/demos/simulation/laser_driver/laser_driver.kicad_pro
+share/kicad/demos/simulation/laser_driver/laser_driver.kicad_sch
+share/kicad/demos/simulation/laser_driver/laser_driver_schlib.kicad_sym
share/kicad/demos/simulation/laser_driver/sym-lib-table
-share/kicad/demos/simulation/pspice/pspice-cache.lib
-share/kicad/demos/simulation/pspice/pspice.pro
-share/kicad/demos/simulation/pspice/pspice.sch
-share/kicad/demos/simulation/pspice/schematic_libspice.dcm
-share/kicad/demos/simulation/pspice/schematic_libspice.lib
+share/kicad/demos/simulation/pspice/pspice.kicad_pro
+share/kicad/demos/simulation/pspice/pspice.kicad_sch
+share/kicad/demos/simulation/pspice/schematic_libspice.kicad_sym
share/kicad/demos/simulation/pspice/sym-lib-table
share/kicad/demos/simulation/rectifier/diode.mod
-share/kicad/demos/simulation/rectifier/rectifier-cache.lib
-share/kicad/demos/simulation/rectifier/rectifier.pro
-share/kicad/demos/simulation/rectifier/rectifier.sch
-share/kicad/demos/simulation/rectifier/rectifier_schlib.lib
+share/kicad/demos/simulation/rectifier/rectifier.kicad_pro
+share/kicad/demos/simulation/rectifier/rectifier.kicad_sch
+share/kicad/demos/simulation/rectifier/rectifier_schlib.kicad_sym
share/kicad/demos/simulation/rectifier/sym-lib-table
share/kicad/demos/simulation/sallen_key/ad8051.lib
-share/kicad/demos/simulation/sallen_key/sallen_key-cache.lib
-share/kicad/demos/simulation/sallen_key/sallen_key.pro
-share/kicad/demos/simulation/sallen_key/sallen_key.sch
-share/kicad/demos/simulation/sallen_key/sallen_key_schlib.lib
+share/kicad/demos/simulation/sallen_key/sallen_key.kicad_pro
+share/kicad/demos/simulation/sallen_key/sallen_key.kicad_sch
+share/kicad/demos/simulation/sallen_key/sallen_key_schlib.kicad_sym
share/kicad/demos/simulation/sallen_key/sym-lib-table
+share/kicad/demos/simulation/v_i_sources/sym-lib-table
+share/kicad/demos/simulation/v_i_sources/v_i_sources.kicad_pro
+share/kicad/demos/simulation/v_i_sources/v_i_sources.kicad_sch
+share/kicad/demos/simulation/v_i_sources/v_i_sources.kicad_sym
share/kicad/demos/sonde xilinx/fp-lib-table
-share/kicad/demos/sonde xilinx/sonde xilinx-cache.lib
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/sonde xilinx/sonde xilinx.kicad_pro
+share/kicad/demos/sonde xilinx/sonde xilinx.kicad_sch
+share/kicad/demos/sonde xilinx/sonde_xilinx_schlib.kicad_sym
share/kicad/demos/sonde xilinx/sym-lib-table
+share/kicad/demos/stickhub/3dmodels/APHB1608.step
+share/kicad/demos/stickhub/3dmodels/Crystal_SMD_4P_2520.step
+share/kicad/demos/stickhub/3dmodels/JST_SH_SM04B-SRSS-TB.STEP
+share/kicad/demos/stickhub/3dmodels/TDFN-8_1.5x2mm_Fused-Lead_MO-252-W2015D.step
+share/kicad/demos/stickhub/LICENSE.md
+share/kicad/demos/stickhub/README.md
+share/kicad/demos/stickhub/RobotProtos.kicad_sym
+share/kicad/demos/stickhub/StickHub.kicad_pcb
+share/kicad/demos/stickhub/StickHub.kicad_pro
+share/kicad/demos/stickhub/StickHub.kicad_sch
+share/kicad/demos/stickhub/footprints.pretty/1005_C.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/1006_C.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/1608_C.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/1P-1.5x1.5.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/2012_C.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/CP_Elec_6.3x11_Board_Edge_Mirrored.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Creative_Commons_BY_Mask.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Creative_Commons_CC_Mask.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Creative_Commons_NC_Mask.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Creative_Commons_SA_Mask.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Crystal_4-SMD_2.5x2mm.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Duo_LED_1.6x0.8_Kingbright_APHB1608LZGKSURKC.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/JP-2_1.5x1.5.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/LQFP-48_7x7mm_P0.5mm.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/Plain_Hole_3mm.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/TDFN-8_1.5x2mm_Fused-Lead_JEDEC_MO-252_W2015D.kicad_mod
+share/kicad/demos/stickhub/footprints.pretty/USB_A_PCB_traces_small.kicad_mod
+share/kicad/demos/stickhub/fp-lib-table
+share/kicad/demos/stickhub/sym-lib-table
share/kicad/demos/test_pads_inside_pads/sym-lib-table
-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_pads_inside_pads/test_pads_inside_pads_schlib.dcm
-share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.lib
-share/kicad/demos/test_xil_95108/carte_test-cache.lib
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_sch
+share/kicad/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.kicad_sym
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.dcm
-share/kicad/demos/test_xil_95108/carte_test_schlib.lib
+share/kicad/demos/test_xil_95108/carte_test.kicad_pro
+share/kicad/demos/test_xil_95108/carte_test.kicad_sch
+share/kicad/demos/test_xil_95108/carte_test_schlib.kicad_sym
share/kicad/demos/test_xil_95108/fp-lib-table
share/kicad/demos/test_xil_95108/sym-lib-table
-share/kicad/demos/video/bus_pci.sch
-share/kicad/demos/video/esvideo.sch
+share/kicad/demos/video/bus_pci.kicad_sch
+share/kicad/demos/video/esvideo.kicad_sch
share/kicad/demos/video/fp-lib-table
-share/kicad/demos/video/graphic.sch
+share/kicad/demos/video/graphic.kicad_sch
+share/kicad/demos/video/libs/footprints.pretty/CV3-30PF.kicad_mod
+share/kicad/demos/video/libs/footprints.pretty/LED_D3.0mm.kicad_mod
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/libs/footprints.pretty/subclick.kicad_mod
+share/kicad/demos/video/libs/fp.3dshapes/subclick_horiz.wings
+share/kicad/demos/video/libs/fp.3dshapes/subclick_horiz.wrl
+share/kicad/demos/video/libs/video_schlib.kicad_sym
+share/kicad/demos/video/modul.kicad_sch
+share/kicad/demos/video/muxdata.kicad_sch
+share/kicad/demos/video/pal-ntsc.kicad_sch
+share/kicad/demos/video/rams.kicad_sch
share/kicad/demos/video/sym-lib-table
-share/kicad/demos/video/video-cache.lib
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/demos/video/video.kicad_pro
+share/kicad/demos/video/video.kicad_sch
+share/kicad/internat/bg/kicad.mo
+share/kicad/internat/ca/kicad.mo
+share/kicad/internat/cs/kicad.mo
+share/kicad/internat/da/kicad.mo
+share/kicad/internat/de/kicad.mo
+share/kicad/internat/el/kicad.mo
+share/kicad/internat/en/kicad.mo
+share/kicad/internat/es/kicad.mo
+share/kicad/internat/es_MX/kicad.mo
+share/kicad/internat/fi/kicad.mo
+share/kicad/internat/fr/kicad.mo
+share/kicad/internat/hu/kicad.mo
+share/kicad/internat/id/kicad.mo
+share/kicad/internat/it/kicad.mo
+share/kicad/internat/ja/kicad.mo
+share/kicad/internat/ko/kicad.mo
+share/kicad/internat/lt/kicad.mo
+share/kicad/internat/lv/kicad.mo
+share/kicad/internat/nl/kicad.mo
+share/kicad/internat/no/kicad.mo
+share/kicad/internat/pl/kicad.mo
+share/kicad/internat/pt/kicad.mo
+share/kicad/internat/pt_br/kicad.mo
+share/kicad/internat/ro/kicad.mo
+share/kicad/internat/ru/kicad.mo
+share/kicad/internat/sk/kicad.mo
+share/kicad/internat/sl/kicad.mo
+share/kicad/internat/sr/kicad.mo
+share/kicad/internat/sv/kicad.mo
+share/kicad/internat/th/kicad.mo
+share/kicad/internat/tr/kicad.mo
+share/kicad/internat/vi/kicad.mo
+share/kicad/internat/zh_CN/kicad.mo
+share/kicad/internat/zh_TW/kicad.mo
share/kicad/plugins/README-bom.txt
share/kicad/plugins/bom2csv.xsl
share/kicad/plugins/bom2grouped_csv.xsl
@@ -282,13 +320,36 @@ share/kicad/plugins/bom_csv_grouped_by_v
share/kicad/plugins/bom_csv_sorted_by_ref.py
share/kicad/plugins/bom_html_grouped_by_value.py
share/kicad/plugins/bom_html_with_advanced_grouping.py
-share/kicad/plugins/bom_sorted_by_ref.py
+share/kicad/plugins/bom_txt_sorted_by_ref.py
share/kicad/plugins/bom_with_title_block_2_csv.xsl
share/kicad/plugins/kicad_netlist_reader.py
+share/kicad/plugins/kicad_utils.py
share/kicad/plugins/netlist_form_OrcadPcb2.xsl
share/kicad/plugins/netlist_form_cadstar-RINF.xsl
share/kicad/plugins/netlist_form_cadstar.xsl
share/kicad/plugins/netlist_form_pads-pcb.asc.xsl
-share/kicad/template/kicad.pro
+share/kicad/resources/images.tar.gz
+share/kicad/schemas/pcm.v1.schema.json
+share/kicad/scripting/kicad_pyshell/__init__.py
+share/kicad/scripting/kicad_pyshell/kicad_pyeditor.py
+share/kicad/scripting/plugins/FPC_wizard.py
+share/kicad/scripting/plugins/FootprintWizardBase.py
+share/kicad/scripting/plugins/PadArray.py
+share/kicad/scripting/plugins/__init__.py
+share/kicad/scripting/plugins/arc_test.py
+share/kicad/scripting/plugins/bga_wizard.py
+share/kicad/scripting/plugins/circular_pad_array_wizard.py
+share/kicad/scripting/plugins/kicad_qrcode.py
+share/kicad/scripting/plugins/microMatch_connectors.py
+share/kicad/scripting/plugins/mutualcap_button_wizard.py
+share/kicad/scripting/plugins/qfn_wizard.py
+share/kicad/scripting/plugins/qfp_wizard.py
+share/kicad/scripting/plugins/qrcode_footprint_wizard.py
+share/kicad/scripting/plugins/sdip_wizard.py
+share/kicad/scripting/plugins/touch_slider_wizard.py
+share/kicad/scripting/plugins/uss39_barcode.py
+share/kicad/scripting/plugins/zip_wizard.py
+share/kicad/template/kicad.kicad_pro
+share/metainfo/org.kicad.kicad.metainfo.xml
share/mime/packages/kicad-gerbers.xml
share/mime/packages/kicad-kicad.xml
Index: pkgsrc/cad/kicad/distinfo
diff -u pkgsrc/cad/kicad/distinfo:1.18 pkgsrc/cad/kicad/distinfo:1.19
--- pkgsrc/cad/kicad/distinfo:1.18 Tue Oct 26 10:04:12 2021
+++ pkgsrc/cad/kicad/distinfo Sun Jan 2 19:10:03 2022
@@ -1,26 +1,30 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 10:04:12 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/01/02 19:10:03 tnn Exp $
-BLAKE2s (kicad-5.1.10.tar.bz2) = d1e38257a94d97c21ea21a61c99f9aba69d0a7d280ecc41a71e3cbfbc031dce4
-SHA512 (kicad-5.1.10.tar.bz2) = 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
-Size (kicad-5.1.10.tar.bz2) = 18586889 bytes
-SHA1 (patch-3d-viewer_3d_cache_sg_CMakeLists.txt) = ead4f35c8980e00f25f804de53b3c14b0287ae57
-SHA1 (patch-CMakeLists.txt) = 1ae2aa5633de9a8e5f7a87a9ceeb5ebc85009494
-SHA1 (patch-CMakeModules_Functions.cmake) = 9517d3451fd90eeb7ef6a98f08b08a925757e360
-SHA1 (patch-CMakeModules_KiCadFullVersion.cmake) = afe5c12f481d52a01827b557c15b8e677ed41c44
-SHA1 (patch-CMakeModules_WritePlatformMetadata_linux.cmake) = 57559c19aee7c793804d99f872163042b991e178
-SHA1 (patch-CMakeModules_WriteVersionHeader.cmake) = ee8a250b2de918c4dcfaffe3cb583fee3c252c2d
+BLAKE2s (kicad-6.0.0.tar.bz2) = 0cd96294a42cf7f4f18bd45fd1c75fbdea77487fac1a58dba745fe41fd229754
+SHA512 (kicad-6.0.0.tar.bz2) = 1267b7cd35a63a3f26c2e9b0695722cbb9b279d1326f52f0b8497bd3011d79a5732e6da27f6413fb72064fe2aca72da95252011c6cb0b70c209f296f40a77b90
+Size (kicad-6.0.0.tar.bz2) = 33925942 bytes
+SHA1 (patch-3d-viewer_3d_cache_sg_CMakeLists.txt) = c6e55d62646e890ba02b2a56dc3481f75ffba8a0
+SHA1 (patch-CMakeLists.txt) = 3f7178bc7c1001c89d3f6cce85a9dd1368acf00e
+SHA1 (patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake) = 0e931bfe471d39694e6bf942f1b9e4de30e27d05
+SHA1 (patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake) = ce50f57ec9621725277a2bf15638d3af6800aebd
+SHA1 (patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake) = 235e2ceffe35f3b2b00dc44302ea3c9c4db86e39
+SHA1 (patch-CMakeModules_Functions.cmake) = d42fafcb65289324206bd2221cc1188b7ff805a8
+SHA1 (patch-CMakeModules_KiCadFullVersion.cmake) = c7a475b6c5bfc9617577279e73047e50906df919
+SHA1 (patch-CMakeModules_WritePlatformMetadata__macos.cmake) = d1e17ae45bdb1749559a36196c5bc303b675970f
SHA1 (patch-CMakeModules_config.h.cmake) = 7d2edb2cf7482724d255b8db0232dd28f6b7e517
-SHA1 (patch-bitmaps_png_CMakeLists.txt) = 1202783b39af4ddf83b9def91eb72b058f2da5bb
-SHA1 (patch-common_CMakeLists.txt) = c1d4db049ed162f936734ec6709d8d78c57b24e2
-SHA1 (patch-common_lib__tree__model.cpp) = 09977f6e8ed3e103dc9f9e60b015feddbad0716d
-SHA1 (patch-cvpcb_CMakeLists.txt) = 6200116775d8d0c098ef11c56959eaaadc0bfbaf
-SHA1 (patch-eeschema_CMakeLists.txt) = 774ab43a9ea7c79ada2ee7faaaa9cfc8805427b7
-SHA1 (patch-gerbview_CMakeLists.txt) = 0a9417eeb432919d57afbfaa07a9651f7df4acb0
-SHA1 (patch-include_hashtables.h) = 4b26adef481406b61c1c9cf660f69847aa76142d
+SHA1 (patch-Documentation_docset_CMakeLists.txt) = be0e200fa6cd7667370e0430916e5b1135f5b864
+SHA1 (patch-bitmaps__png_CMakeLists.txt) = 4703eb15ecf44a9925f5d047885513ed34e4f596
+SHA1 (patch-common_CMakeLists.txt) = 020edca68947f6b6bbf611b7e82ba555db29c259
+SHA1 (patch-common_lib__tree__model.cpp) = 9b98a1520aac99f835547e240a1cd7367db436e3
+SHA1 (patch-cvpcb_CMakeLists.txt) = 80a3735a7a4a7c54dd577b436e2c3b3527d5e496
+SHA1 (patch-eeschema_CMakeLists.txt) = c237961ba01e6d77852e5d02bce3f4973a287d63
+SHA1 (patch-gerbview_CMakeLists.txt) = a7c0ef0d03763a82f8a71033a6142646fe10388b
SHA1 (patch-include_kiway.h) = 7208f474e895ea07ba5e5f56bab46d4d529b9e57
-SHA1 (patch-include_system_libcontext.h) = 895ae55ab10dd2582d6b258aa2f7358721b27972
-SHA1 (patch-pagelayout_editor_CMakeLists.txt) = 5107e7fa37227143a3a0950847b607438b5c97dd
-SHA1 (patch-pcb_calculator_CMakeLists.txt) = bf335e3cb8e513fb9d6a1518f479dfe9786c70da
-SHA1 (patch-pcbnew_CMakeLists.txt) = 3ec0b39483c18888f5c5d185ff81a28b597ee4d5
-SHA1 (patch-plugins_3d_idf_CMakeLists.txt) = 1c58b6925d2947bcfbaf4e91cc5ee28068899998
-SHA1 (patch-plugins_3d_vrml_CMakeLists.txt) = 3336027c7eacf8fceb61875e9757480aae81a245
+SHA1 (patch-kicad_CMakeLists.txt) = 7eebcb2cbb08e840d4cdbca2565400b65f0731f3
+SHA1 (patch-pagelayout__editor_CMakeLists.txt) = ecdc3d0ac8e33faf4f0a5d090149563bb26f6bb4
+SHA1 (patch-pcb__calculator_CMakeLists.txt) = ea6852cc3e5d8d4bf6760c905e999d65d5231c83
+SHA1 (patch-pcbnew_CMakeLists.txt) = d5259ede050e3557bfcb6596322a26b6bfc01173
+SHA1 (patch-plugins_3d_idf_CMakeLists.txt) = 9061c5c5eac3311625ba93e541d557007c83eddc
+SHA1 (patch-plugins_3d_vrml_CMakeLists.txt) = ea6942a953432c5c0124c57e9afb01f8a5c5325d
+SHA1 (patch-resources_CMakeLists.txt) = 55a41028d77d1854859ed27c8086cc7552b9f988
+SHA1 (patch-thirdparty_libcontext_libcontext.h) = cde252b7ee114f88527d953aa0c3ebcdd905c4a9
Index: pkgsrc/cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists.txt:1.2 pkgsrc/cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists.txt:1.3
--- pkgsrc/cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists.txt:1.2 Sun Feb 21 18:56:36 2021
+++ pkgsrc/cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-3d-viewer_3d_cache_sg_CMakeLists.txt,v 1.2 2021/02/21 18:56:36 bouyer Exp $
+$NetBSD: patch-3d-viewer_3d_cache_sg_CMakeLists.txt,v 1.3 2022/01/02 19:10:03 tnn Exp $
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
--- 3d-viewer/3d_cache/sg/CMakeLists.txt.orig 2020-12-22 21:05:01.000000000 +0100
+++ 3d-viewer/3d_cache/sg/CMakeLists.txt 2021-02-20 10:21:32.108366364 +0100
Index: pkgsrc/cad/kicad/patches/patch-CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-CMakeLists.txt:1.5 pkgsrc/cad/kicad/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/cad/kicad/patches/patch-CMakeLists.txt:1.5 Sun Feb 21 18:56:36 2021
+++ pkgsrc/cad/kicad/patches/patch-CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,20 +1,20 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2021/02/21 18:56:36 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2022/01/02 19:10:03 tnn Exp $
Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
and containt multiple directories
---- CMakeLists.txt.orig 2020-12-22 21:05:01.000000000 +0100
-+++ CMakeLists.txt 2021-02-20 11:17:34.774733503 +0100
-@@ -36,7 +36,7 @@
- include( GNUInstallDirs )
+--- CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeLists.txt
+@@ -208,7 +208,7 @@ perform_feature_checks()
- # Path to local CMake modules.
--set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules )
-+set (CMAKE_MODULE_PATH "/usr/tmp/cad/kicad/work/.buildlink/cmake-Modules" ${PROJECT_SOURCE_DIR}/CMakeModules )
- # On Windows, binaries created by link option -g3 are very large (more than 1Gb for pcbnew,
- # and more than 3Gb for the full kicad suite)
-@@ -861,7 +861,7 @@
+ # Setup the compiler warnings
+-include( ${CMAKE_MODULE_PATH}/Warnings.cmake )
++include( ${PROJECT_SOURCE_DIR}/CMakeModules/Warnings.cmake )
+
+ if( KICAD_WIN32_CONTEXT_WINFIBER )
+ set(LIBCONTEXT_USE_WINFIBER true)
+@@ -933,7 +933,7 @@ endif()
# "make uninstall" rules
#================================================
configure_file(
@@ -23,15 +23,3 @@ and containt multiple directories
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY )
-@@ -873,9 +873,9 @@
- # Generate platform metadata files
- #################################################
- if( APPLE )
-- include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_macos.cmake )
-+ include( ${PROJECT_SOURCE_DIR}/CMakeModules/WritePlatformMetadata_macos.cmake )
- elseif( UNIX )
-- include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_linux.cmake )
-+ include( ${PROJECT_SOURCE_DIR}/CMakeModules/WritePlatformMetadata_linux.cmake )
- endif()
-
-
Index: pkgsrc/cad/kicad/patches/patch-eeschema_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-eeschema_CMakeLists.txt:1.5 pkgsrc/cad/kicad/patches/patch-eeschema_CMakeLists.txt:1.6
--- pkgsrc/cad/kicad/patches/patch-eeschema_CMakeLists.txt:1.5 Sun Feb 21 18:56:36 2021
+++ pkgsrc/cad/kicad/patches/patch-eeschema_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,31 +1,35 @@
-$NetBSD: patch-eeschema_CMakeLists.txt,v 1.5 2021/02/21 18:56:36 bouyer Exp $
+$NetBSD: patch-eeschema_CMakeLists.txt,v 1.6 2022/01/02 19:10:03 tnn Exp $
Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
-and containt multiple directories
+and contains multiple directories
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
---- eeschema/CMakeLists.txt.orig 2020-12-22 21:05:01.000000000 +0100
-+++ eeschema/CMakeLists.txt 2021-02-20 10:28:21.902013845 +0100
-@@ -283,7 +283,7 @@
+--- eeschema/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ eeschema/CMakeLists.txt
+@@ -313,8 +313,8 @@ add_custom_command(
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"
-@@ -309,7 +309,7 @@
- endif()
-
-
--add_executable( eeschema WIN32 MACOSX_BUNDLE
-+add_executable( eeschema WIN32
- ../common/single_top.cpp
- ../common/pgm_base.cpp
- ${EESCHEMA_RESOURCES}
-@@ -392,6 +392,9 @@
+ -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md
+ -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help_md.h
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+- DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake
++ DEPENDS ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md
+ COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help_md.h
+ from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md"
+ )
+@@ -330,8 +330,8 @@ add_custom_command(
+ COMMAND ${CMAKE_COMMAND}
+ -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md
+ -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help_md.h
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+- DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake
++ DEPENDS ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md
+ COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help_md.h
+ from ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md"
+ )
+@@ -439,6 +439,9 @@ if( MAKE_LINK_MAPS )
)
endif()
Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_Functions.cmake
diff -u pkgsrc/cad/kicad/patches/patch-CMakeModules_Functions.cmake:1.4 pkgsrc/cad/kicad/patches/patch-CMakeModules_Functions.cmake:1.5
--- pkgsrc/cad/kicad/patches/patch-CMakeModules_Functions.cmake:1.4 Thu Aug 29 15:36:40 2019
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_Functions.cmake Sun Jan 2 19:10:03 2022
@@ -1,25 +1,53 @@
-$NetBSD: patch-CMakeModules_Functions.cmake,v 1.4 2019/08/29 15:36:40 bouyer Exp $
+$NetBSD: patch-CMakeModules_Functions.cmake,v 1.5 2022/01/02 19:10:03 tnn Exp $
Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
-and containt multiple directories
+and contains multiple directories
---- CMakeModules/Functions.cmake.orig 2019-08-04 18:36:25.000000000 +0200
-+++ CMakeModules/Functions.cmake 2019-08-29 13:23:28.260311176 +0200
-@@ -40,7 +40,7 @@
- -DinputFile=${inputFile}
- -DoutHeaderFile=${outHeaderFile}
- -DoutCppFile=${outCppFile}
-- -P ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake
-+ -P ${PROJECT_SOURCE_DIR}/CMakeModules/TokenList2DsnLexer.cmake
+--- CMakeModules/Functions.cmake.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeModules/Functions.cmake
+@@ -40,13 +40,13 @@ function( make_lexer outputTarget inputF
+ -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/${inputFile}
+ -DoutHeaderFile=${CMAKE_CURRENT_BINARY_DIR}/${outHeaderFile}
+ -DoutCppFile=${CMAKE_CURRENT_BINARY_DIR}/${outCppFile}
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/TokenList2DsnLexer.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/TokenList2DsnLexer.cmake
COMMENT "TokenList2DsnLexer.cmake creating:
${outHeaderFile} and
${outCppFile} from
-@@ -49,7 +49,7 @@
-
- add_custom_target( ${outputTarget}
- DEPENDS ${outHeaderFile} ${outCppFile}
-- ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake
-+ ${PROJECT_SOURCE_DIR}/CMakeModules/TokenList2DsnLexer.cmake
+ ${inputFile}"
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${inputFile}
+- ${CMAKE_MODULE_PATH}/BuildSteps/TokenList2DsnLexer.cmake
++ ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/TokenList2DsnLexer.cmake
)
- # extra_args, if any, are treated as source files (typically headers) which
+ target_sources( ${outputTarget} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${outCppFile} )
+@@ -84,11 +84,11 @@ function( generate_lemon_grammar TGT GRA
+ -DLEMON_TEMPLATE=${LEMON_TEMPLATE}
+ -DGRAMMAR_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${GRAMMAR_FILE}
+ -DGRAMMAR_DIR=${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_DIR}
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/LemonParserGenerator.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/LemonParserGenerator.cmake
+ COMMENT "Running Lemon on ${GRAMMAR_FILE} to generate ${GRAMMAR_DIR}/${GRAMMAR_BASE}.c"
+ DEPENDS lemon
+ ${CMAKE_CURRENT_SOURCE_DIR}/${GRAMMAR_FILE}
+- ${CMAKE_MODULE_PATH}/BuildSteps/LemonParserGenerator.cmake
++ ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/LemonParserGenerator.cmake
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_DIR}
+ )
+
+@@ -186,13 +186,13 @@ macro( linux_metadata_translation SRC_FI
+ OUTPUT ${OUT_FILE}
+ DEPENDS ${SRC_FILE}
+ ${LANG_FILES}
+- ${CMAKE_MODULE_PATH}/BuildSteps/TranslatePlatformMetadata_linux.cmake
++ ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/TranslatePlatformMetadata_linux.cmake
+ COMMAND ${CMAKE_COMMAND}
+ -DMSGFMT_EXE="${GETTEXT_MSGFMT_EXECUTABLE}"
+ -DPO_DIR="${PO_DIR}"
+ -DSRC_FILE="${SRC_FILE}"
+ -DDEST_FILE="${OUT_FILE}"
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/TranslatePlatformMetadata_linux.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/TranslatePlatformMetadata_linux.cmake
+ COMMENT "Translating file ${OUT_FNAME}"
+ )
+ else()
Index: pkgsrc/cad/kicad/patches/patch-common_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-common_CMakeLists.txt:1.4 pkgsrc/cad/kicad/patches/patch-common_CMakeLists.txt:1.5
--- pkgsrc/cad/kicad/patches/patch-common_CMakeLists.txt:1.4 Sun Feb 21 18:56:36 2021
+++ pkgsrc/cad/kicad/patches/patch-common_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,16 +1,22 @@
-$NetBSD: patch-common_CMakeLists.txt,v 1.4 2021/02/21 18:56:36 bouyer Exp $
+$NetBSD: patch-common_CMakeLists.txt,v 1.5 2022/01/02 19:10:03 tnn Exp $
Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
-and containt multiple directories
+and contains multiple directories
---- common/CMakeLists.txt.orig 2020-12-22 21:05:01.000000000 +0100
-+++ common/CMakeLists.txt 2021-02-20 11:28:33.611686383 +0100
-@@ -168,7 +168,7 @@
+--- common/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ common/CMakeLists.txt
+@@ -139,11 +139,11 @@ add_custom_target(
-DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h
+ -DTEXT_OUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.txt
-DSRC_PATH=${PROJECT_SOURCE_DIR}
- -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
-- -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake
-+ -P ${PROJECT_SOURCE_DIR}/CMakeModules/WriteVersionHeader.cmake
+- -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/WriteVersionHeader.cmake
++ -DCMAKE_MODULE_PATH="${CMAKE_MODULE_PATH}"
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/WriteVersionHeader.cmake
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
BYPRODUCTS ${CMAKE_BINARY_DIR}/kicad_build_version.h
+- DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/WriteVersionHeader.cmake
++ DEPENDS ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/WriteVersionHeader.cmake
COMMENT "Generating version string header"
+ )
+
Index: pkgsrc/cad/kicad/patches/patch-cvpcb_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-cvpcb_CMakeLists.txt:1.4 pkgsrc/cad/kicad/patches/patch-cvpcb_CMakeLists.txt:1.5
--- pkgsrc/cad/kicad/patches/patch-cvpcb_CMakeLists.txt:1.4 Sun Feb 21 18:56:36 2021
+++ pkgsrc/cad/kicad/patches/patch-cvpcb_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-cvpcb_CMakeLists.txt,v 1.4 2021/02/21 18:56:36 bouyer Exp $
+$NetBSD: patch-cvpcb_CMakeLists.txt,v 1.5 2022/01/02 19:10:03 tnn Exp $
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
---- cvpcb/CMakeLists.txt.orig 2020-12-22 21:05:01.000000000 +0100
-+++ cvpcb/CMakeLists.txt 2021-02-20 10:20:18.102832805 +0100
-@@ -117,6 +117,9 @@
- LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_cvpcb.kiface.map" )
+--- cvpcb/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ cvpcb/CMakeLists.txt
+@@ -96,6 +96,9 @@ if( MAKE_LINK_MAPS )
+ LINK_FLAGS "-Wl,-cref,-Map=_cvpcb.kiface.map" )
endif()
+set_property(TARGET cvpcb_kiface APPEND_STRING
Index: pkgsrc/cad/kicad/patches/patch-pcbnew_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-pcbnew_CMakeLists.txt:1.4 pkgsrc/cad/kicad/patches/patch-pcbnew_CMakeLists.txt:1.5
--- pkgsrc/cad/kicad/patches/patch-pcbnew_CMakeLists.txt:1.4 Fri Jun 14 15:59:32 2019
+++ pkgsrc/cad/kicad/patches/patch-pcbnew_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,22 +1,24 @@
-$NetBSD: patch-pcbnew_CMakeLists.txt,v 1.4 2019/06/14 15:59:32 bouyer Exp $
+$NetBSD: patch-pcbnew_CMakeLists.txt,v 1.5 2022/01/02 19:10:03 tnn Exp $
Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
-and containt multiple directories
+and contains multiple directories
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
---- pcbnew/CMakeLists.txt.orig 2018-07-13 19:53:52.000000000 +0000
+--- pcbnew/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
+++ pcbnew/CMakeLists.txt
-@@ -580,7 +580,7 @@ endif()
-
-
- # a very small program launcher for pcbnew_kiface
--add_executable( pcbnew WIN32 MACOSX_BUNDLE
-+add_executable( pcbnew WIN32
- ../common/single_top.cpp
- ${PCBNEW_RESOURCES}
+@@ -562,8 +562,8 @@ add_custom_command(
+ COMMAND ${CMAKE_COMMAND}
+ -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md
+ -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help_md.h
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+- DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake
++ DEPENDS ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md
+ COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help_md.h
+ from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md"
)
-@@ -674,6 +674,9 @@ if( PCBNEW_LINK_MAPS )
+@@ -727,6 +727,9 @@ if( PCBNEW_LINK_MAPS )
)
endif()
Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_KiCadFullVersion.cmake
diff -u pkgsrc/cad/kicad/patches/patch-CMakeModules_KiCadFullVersion.cmake:1.1 pkgsrc/cad/kicad/patches/patch-CMakeModules_KiCadFullVersion.cmake:1.2
--- pkgsrc/cad/kicad/patches/patch-CMakeModules_KiCadFullVersion.cmake:1.1 Sun Feb 21 18:56:36 2021
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_KiCadFullVersion.cmake Sun Jan 2 19:10:03 2022
@@ -1,16 +1,16 @@
-$NetBSD: patch-CMakeModules_KiCadFullVersion.cmake,v 1.1 2021/02/21 18:56:36 bouyer Exp $
+$NetBSD: patch-CMakeModules_KiCadFullVersion.cmake,v 1.2 2022/01/02 19:10:03 tnn Exp $
Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
-and containt multiple directories
+and contains multiple directories
---- CMakeModules/KiCadFullVersion.cmake.orig 2021-02-20 11:23:32.177620736 +0100
-+++ CMakeModules/KiCadFullVersion.cmake 2021-02-20 11:23:47.641157793 +0100
+--- CMakeModules/KiCadFullVersion.cmake.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeModules/KiCadFullVersion.cmake
@@ -28,7 +28,7 @@
# 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( ${CMAKE_CURRENT_LIST_DIR}/CreateGitVersionHeader.cmake )
++include( ${SRC_PATH}/CMakeModules/CreateGitVersionHeader.cmake )
create_git_version_header( ${SRC_PATH} )
# $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
Index: pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp
diff -u pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp:1.1 pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp:1.2
--- pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp:1.1 Mon Jun 1 03:50:21 2020
+++ pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp Sun Jan 2 19:10:03 2022
@@ -1,16 +1,15 @@
-$NetBSD: patch-common_lib__tree__model.cpp,v 1.1 2020/06/01 03:50:21 mef Exp $
+$NetBSD: patch-common_lib__tree__model.cpp,v 1.2 2022/01/02 19:10:03 tnn Exp $
/tmp/cad/kicad/work/kicad-5.1.4/common/lib_tree_model.cpp:78:14: error: 'sort' is not a member of 'std'
std::sort( sort_buf.begin(), sort_buf.end(),
- ^~~~
---- common/lib_tree_model.cpp.orig 2020-06-01 08:09:39.469102942 +0900
-+++ common/lib_tree_model.cpp 2020-06-01 08:10:04.891802170 +0900
+--- common/lib_tree_model.cpp.orig 2021-12-22 13:32:19.000000000 +0000
++++ common/lib_tree_model.cpp
@@ -25,6 +25,7 @@
+ #include <eda_pattern_match.h>
#include <lib_tree_item.h>
- #include <make_unique.h>
#include <utility>
+#include <algorithm>
#include <pgm_base.h>
- #include <kicad_string.h>
+ #include <string_utils.h>
Index: pkgsrc/cad/kicad/patches/patch-plugins_3d_idf_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-plugins_3d_idf_CMakeLists.txt:1.1 pkgsrc/cad/kicad/patches/patch-plugins_3d_idf_CMakeLists.txt:1.2
--- pkgsrc/cad/kicad/patches/patch-plugins_3d_idf_CMakeLists.txt:1.1 Fri Jun 14 15:59:32 2019
+++ pkgsrc/cad/kicad/patches/patch-plugins_3d_idf_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-plugins_3d_idf_CMakeLists.txt,v 1.1 2019/06/14 15:59:32 bouyer Exp $
+$NetBSD: patch-plugins_3d_idf_CMakeLists.txt,v 1.2 2022/01/02 19:10:03 tnn Exp $
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
--- plugins/3d/idf/CMakeLists.txt.orig 2019-05-29 17:01:08.898401494 +0200
+++ plugins/3d/idf/CMakeLists.txt 2019-05-29 17:02:00.543946926 +0200
Index: pkgsrc/cad/kicad/patches/patch-plugins_3d_vrml_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-plugins_3d_vrml_CMakeLists.txt:1.1 pkgsrc/cad/kicad/patches/patch-plugins_3d_vrml_CMakeLists.txt:1.2
--- pkgsrc/cad/kicad/patches/patch-plugins_3d_vrml_CMakeLists.txt:1.1 Fri Jun 14 15:59:32 2019
+++ pkgsrc/cad/kicad/patches/patch-plugins_3d_vrml_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-plugins_3d_vrml_CMakeLists.txt,v 1.1 2019/06/14 15:59:32 bouyer Exp $
+$NetBSD: patch-plugins_3d_vrml_CMakeLists.txt,v 1.2 2022/01/02 19:10:03 tnn Exp $
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
--- plugins/3d/vrml/CMakeLists.txt.orig 2019-05-29 17:03:14.351417166 +0200
+++ plugins/3d/vrml/CMakeLists.txt 2019-05-29 17:03:37.760641586 +0200
Index: pkgsrc/cad/kicad/patches/patch-gerbview_CMakeLists.txt
diff -u pkgsrc/cad/kicad/patches/patch-gerbview_CMakeLists.txt:1.3 pkgsrc/cad/kicad/patches/patch-gerbview_CMakeLists.txt:1.4
--- pkgsrc/cad/kicad/patches/patch-gerbview_CMakeLists.txt:1.3 Fri Jun 14 15:59:32 2019
+++ pkgsrc/cad/kicad/patches/patch-gerbview_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -1,21 +1,12 @@
-$NetBSD: patch-gerbview_CMakeLists.txt,v 1.3 2019/06/14 15:59:32 bouyer Exp $
+$NetBSD: patch-gerbview_CMakeLists.txt,v 1.4 2022/01/02 19:10:03 tnn Exp $
-Force proper LDFLAGS for MODULE, as cmake doens't set rpath for theses
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
---- gerbview/CMakeLists.txt.orig 2018-07-13 19:53:52.000000000 +0000
+--- gerbview/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
+++ gerbview/CMakeLists.txt
-@@ -106,7 +106,7 @@ if( APPLE )
- set( MACOSX_BUNDLE_NAME gerbview )
- endif()
-
--add_executable( gerbview WIN32 MACOSX_BUNDLE
-+add_executable( gerbview WIN32
- ../common/single_top.cpp
- ../common/pgm_base.cpp
- ${GERBVIEW_RESOURCES}
-@@ -158,6 +158,9 @@ if( MAKE_LINK_MAPS )
- LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" )
- endif()
+@@ -173,6 +173,9 @@ target_include_directories( gerbview_kif
+ $<TARGET_PROPERTY:nlohmann_json,INTERFACE_INCLUDE_DIRECTORIES>
+ )
+set_property(TARGET gerbview_kiface APPEND_STRING
+ PROPERTY LINK_FLAGS " $ENV{LDFLAGS}")
Added files:
Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake Sun Jan 2 19:10:03 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeModules_BuildSteps_CreateDocsetDoxyfile.cmake,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- CMakeModules/BuildSteps/CreateDocsetDoxyfile.cmake.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeModules/BuildSteps/CreateDocsetDoxyfile.cmake
+@@ -22,7 +22,7 @@
+
+ function(get_kicad_doc_version RESULT_NAME)
+
+- include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
++ include( ${PROJECT_SOURCE_DIR}/CMakeModules/CreateGitVersionHeader.cmake )
+ create_git_version_header(${CMAKE_SOURCE_DIR})
+
+ # Now we have KICAD_VERSION, but it's got () around it
Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake Sun Jan 2 19:10:03 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeModules_BuildSteps_WritePlatformMetadata__linux.cmake,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- CMakeModules/BuildSteps/WritePlatformMetadata_linux.cmake.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeModules/BuildSteps/WritePlatformMetadata_linux.cmake
+@@ -32,8 +32,8 @@
+ message( STATUS "Creating linux metadata" )
+
+ # Create the KiCad version strings
+-include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+-include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
++include( ${SRC_PATH}/CMakeModules/KiCadVersion.cmake )
++include( ${SRC_PATH}/CMakeModules/KiCadFullVersion.cmake )
+
+ # Create the date of the configure
+ string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake Sun Jan 2 19:10:03 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeModules_BuildSteps_WriteVersionHeader.cmake,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- CMakeModules/BuildSteps/WriteVersionHeader.cmake.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeModules/BuildSteps/WriteVersionHeader.cmake
+@@ -23,8 +23,8 @@
+ #
+
+ # Create the KiCad version strings
+-include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+-include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
++include( ${SRC_PATH}/CMakeModules/KiCadVersion.cmake )
++include( ${SRC_PATH}/CMakeModules/KiCadFullVersion.cmake )
+
+ # Extract the major and minor build version as a string
+ string( REGEX MATCH
Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_WritePlatformMetadata__macos.cmake
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-CMakeModules_WritePlatformMetadata__macos.cmake:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_WritePlatformMetadata__macos.cmake Sun Jan 2 19:10:03 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeModules_WritePlatformMetadata__macos.cmake,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- CMakeModules/WritePlatformMetadata_macos.cmake.orig 2021-12-22 13:32:19.000000000 +0000
++++ CMakeModules/WritePlatformMetadata_macos.cmake
+@@ -29,8 +29,8 @@ message( STATUS "Creating MacOS metadata
+
+ # Create the KiCad version strings
+ set( SRC_PATH ${PROJECT_SOURCE_DIR} )
+-include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+-include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
++include( ${PROJECT_SOURCE_DIR}/CMakeModules/KiCadVersion.cmake )
++include( ${PROJECT_SOURCE_DIR}/CMakeModules/KiCadFullVersion.cmake )
+
+
+ # Configure each plist file from the respurces directory and store it in the build directory
Index: pkgsrc/cad/kicad/patches/patch-Documentation_docset_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-Documentation_docset_CMakeLists.txt:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-Documentation_docset_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -0,0 +1,23 @@
+$NetBSD: patch-Documentation_docset_CMakeLists.txt,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- Documentation/docset/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ Documentation/docset/CMakeLists.txt
+@@ -62,12 +62,12 @@ if(DOXYGEN_FOUND AND DOXYTAG2ZEALDB AND
+ -DDOCSET_BUNDLE_ID=${DOCSET_BUNDLE_ID}
+ -DDOCSET_DOXYFILE=${DOCSET_DOXYFILE}
+ -DOUTPUT_DIRECTORY="${CMAKE_CURRENT_BINARY_DIR}/doxygen"
+- -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
++ -DCMAKE_MODULE_PATH="${CMAKE_MODULE_PATH}"
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/CreateDocsetDoxyfile.cmake
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
+ OUTPUT ${DOCSET_DOXYFILE}
+ DEPENDS ${CMAKE_BINARY_DIR}/kicad_build_version.h
+- ${CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
++ ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/CreateDocsetDoxyfile.cmake
+ COMMENT "Modifying doxyfile for docset creation"
+ )
+
Index: pkgsrc/cad/kicad/patches/patch-bitmaps__png_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-bitmaps__png_CMakeLists.txt:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-bitmaps__png_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-bitmaps__png_CMakeLists.txt,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- bitmaps_png/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ bitmaps_png/CMakeLists.txt
+@@ -685,9 +685,9 @@ function( png2cpp inputFile outFile )
+ OUTPUT ${outFile}
+
+ COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/PNG2cpp.cmake
+
+- DEPENDS ${inputFile} ${CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
++ DEPENDS ${inputFile} ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/PNG2cpp.cmake
+ COMMENT "Creating ${outFile}"
+ )
+ endfunction()
Index: pkgsrc/cad/kicad/patches/patch-kicad_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-kicad_CMakeLists.txt:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-kicad_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-kicad_CMakeLists.txt,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- kicad/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ kicad/CMakeLists.txt
+@@ -164,7 +164,7 @@ if( APPLE )
+ ${OSX_BUNDLE_OVERRIDE_PATHS}
+
+ # do all the work
+- include( ${CMAKE_MODULE_PATH}/BundleUtilities.cmake )
++ include( ${PROJECT_SOURCE_DIR}/CMakeModules/BundleUtilities.cmake )
+
+ if ( ${PYTHON_FRAMEWORK_HELPER} )
+ # This idea here is to repair anything that fixup_bundle doesn't handle
+@@ -235,7 +235,7 @@ if( APPLE )
+ move_to_main_bundle( \"pl_editor.app\" \"Page Layout Editor.app\" )
+
+ if ( ${PYTHON_FRAMEWORK_HELPER} )
+- include( ${CMAKE_MODULE_PATH}/RefixupMacOS.cmake )
++ include( ${PROJECT_SOURCE_DIR}/CMakeModules/RefixupMacOS.cmake )
+ refix_kicad_bundle(${OSX_BUNDLE_INSTALL_DIR})
+ endif( )
+
Index: pkgsrc/cad/kicad/patches/patch-pagelayout__editor_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-pagelayout__editor_CMakeLists.txt:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-pagelayout__editor_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -0,0 +1,23 @@
+$NetBSD: patch-pagelayout__editor_CMakeLists.txt,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
+
+--- pagelayout_editor/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ pagelayout_editor/CMakeLists.txt
+@@ -124,6 +124,9 @@ if( MAKE_LINK_MAPS )
+ LINK_FLAGS "-Wl,-cref,-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 )
+
+@@ -171,4 +174,4 @@ if( KICAD_WIN32_INSTALL_PDBS )
+ # Get the PDBs to copy over for MSVC
+ install(FILES $<TARGET_PDB_FILE:pl_editor> DESTINATION ${KICAD_BIN})
+ install(FILES $<TARGET_PDB_FILE:pl_editor_kiface> DESTINATION ${KICAD_BIN})
+-endif()
+\ No newline at end of file
++endif()
Index: pkgsrc/cad/kicad/patches/patch-pcb__calculator_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-pcb__calculator_CMakeLists.txt:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-pcb__calculator_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -0,0 +1,38 @@
+$NetBSD: patch-pcb__calculator_CMakeLists.txt,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Force proper LDFLAGS for MODULE, as cmake doesn't set rpath for these
+
+--- pcb_calculator/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ pcb_calculator/CMakeLists.txt
+@@ -112,6 +112,9 @@ if( MAKE_LINK_MAPS )
+ LINK_FLAGS "-Wl,-cref,-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 )
+
+@@ -179,8 +182,8 @@ function( html_doc2h inputFile )
+ add_custom_command(
+ OUTPUT ${inputFile}.h
+ COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile}.html -DoutputFile=${inputFile}.h
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/Html2C.cmake
+- DEPENDS ${inputFile}.html ${CMAKE_MODULE_PATH}/BuildSteps/Html2C.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/Html2C.cmake
++ DEPENDS ${inputFile}.html ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/Html2C.cmake
+ COMMENT "creating ${inputFile}.h from ${inputFile}.html"
+ )
+ endfunction()
+@@ -193,8 +196,8 @@ function( md_doc2h inputFile )
+ OUTPUT ${inputFile}.h
+
+ COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile}.md -DoutputFile=${inputFile}.h
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+- DEPENDS ${inputFile}.md ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake
++ DEPENDS ${inputFile}.md ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/markdown2C.cmake
+ COMMENT "creating ${inputFile}.h from ${inputFile}.md"
+ )
+ endfunction()
Index: pkgsrc/cad/kicad/patches/patch-resources_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-resources_CMakeLists.txt:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-resources_CMakeLists.txt Sun Jan 2 19:10:03 2022
@@ -0,0 +1,27 @@
+$NetBSD: patch-resources_CMakeLists.txt,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Don't use ${CMAKE_MODULE_PATH} directly as it will be changed
+and contains multiple directories
+
+--- resources/CMakeLists.txt.orig 2021-12-22 13:32:19.000000000 +0000
++++ resources/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ #################################################
+ if( APPLE )
+ #TODO Generate this at runtime as well
+- include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_macos.cmake )
++ include( ${PROJECT_SOURCE_DIR}/CMakeModules/WritePlatformMetadata_macos.cmake )
+ elseif( UNIX )
+ # Add the command to configure the linux metainfo file with the version information
+ add_custom_command(
+@@ -12,8 +12,8 @@ elseif( UNIX )
+ -DSRC_PATH=${PROJECT_SOURCE_DIR}
+ -DBUILD_PATH=${PROJECT_BINARY_DIR}
+ -DCMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/CMakeModules
+- -P ${CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake
+- DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake
++ -P ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/WritePlatformMetadata_linux.cmake
++ DEPENDS ${PROJECT_SOURCE_DIR}/CMakeModules/BuildSteps/WritePlatformMetadata_linux.cmake
+ COMMENT "Configuring Linux metainfo"
+ )
+
Index: pkgsrc/cad/kicad/patches/patch-thirdparty_libcontext_libcontext.h
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-thirdparty_libcontext_libcontext.h:1.1
--- /dev/null Sun Jan 2 19:10:03 2022
+++ pkgsrc/cad/kicad/patches/patch-thirdparty_libcontext_libcontext.h Sun Jan 2 19:10:03 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-thirdparty_libcontext_libcontext.h,v 1.1 2022/01/02 19:10:03 tnn Exp $
+
+Add NetBSD support.
+
+--- thirdparty/libcontext/libcontext.h.orig 2021-12-22 13:32:19.000000000 +0000
++++ thirdparty/libcontext/libcontext.h
+@@ -22,13 +22,13 @@
+ #include <cstdio>
+
+
+-#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+
+ #undef LIBCONTEXT_HAS_OWN_STACK
+
+ #define LIBCONTEXT_COMPILER_gcc
+
+- #if defined(__linux__) || defined(__FreeBSD__)
++ #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #if defined(__x86_64__) || defined(__amd64__)
+ #define LIBCONTEXT_PLATFORM_linux_x86_64
+ #define LIBCONTEXT_CALL_CONVENTION
Home |
Main Index |
Thread Index |
Old Index