Hello,
Here is an update for cad/kicad and cad/kicad-shared, bringing us to
5.1.12. I couldn't find any release notes, so we'll just call this port
more-better.
Tested on amd64.
ok?
--
Tracey Emery
diff fd5977dbfc7c84a142f275771aba546a290ddb1c /usr/ports/mystuff
blob - ac7cb30db708a3f1a36a77d98b71b3d59d6a42d5
file + cad/kicad/Makefile
--- cad/kicad/Makefile
+++ cad/kicad/Makefile
@@ -4,10 +4,9 @@
BROKEN-powerpc = segfaults when trying to run the PCB editor
BROKEN-riscv64 = kicad-5.1.10/include/system/libcontext.h:93:36: error:
expected ';' after top level declarator
-V = 5.1.10
+V = 5.1.12
COMMENT = schematic and PCB editing software
DISTNAME = kicad-${V}
-REVISION = 1
EPOCH = 0
SHARED_LIBS += kicad_3dsg 0.0 # 2.0
@@ -19,17 +18,18 @@ HOMEPAGE = https://www.kicad.org
#GPLv3
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE PTKernel SM TKBO
-WANTLIB += TKBRep TKBin TKBinL TKBinXCAF TKBool TKCAF TKCDF TKFillet
+WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU TKBO TKBRep TKBin TKBinL
+WANTLIB += TKBinTObj TKBinXCAF TKBool TKCAF TKCDF TKFeat TKFillet
WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKIGES TKLCAF
-WANTLIB += TKMath TKMesh TKOffset TKPCAF TKPLCAF TKPShape TKPrim
-WANTLIB += TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKService TKShHealing
-WANTLIB += TKTopAlgo TKV3d TKXCAF TKXDEIGES TKXDESTEP TKXSBase
-WANTLIB += TKernel X11 Xext boost_context-mt boost_system-mt
-WANTLIB += c cairo crypto curl freetype m ngspice pixman-1 ${MODPY_WANTLIB}
-WANTLIB += ssl wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
-WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
-WANTLIB += wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0 wx_gtk3u_stc-3.0
+WANTLIB += TKMath TKMesh TKMeshVS TKOffset TKOpenGl TKPrim TKSTEP
+WANTLIB += TKSTEP209 TKSTEPAttr TKSTEPBase TKSTL TKService TKShHealing
+WANTLIB += TKTObj TKTopAlgo TKV3d TKVRML TKXCAF TKXDEIGES TKXDESTEP
+WANTLIB += TKXMesh TKXSBase TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
+WANTLIB += boost_context-mt boost_system-mt c cairo crypto curl
+WANTLIB += m ngspice pixman-1 python3.9 ssl wx_baseu-3.0 wx_baseu_net-3.0
+WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
+WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
+WANTLIB += wx_gtk3u_stc-3.0
MASTER_SITES = https://gitlab.com/kicad/code/kicad/-/archive/${V}/
@@ -68,7 +68,7 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \
-DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wx-config \
-DwxWidgets_LIBRARIES="${LOCALBASE}/lib" \
-DwxWidgets_INCLUDE_DIRS="${LOCALBASE}/include/wx-3.0" \
- -DOCE_DIR="${LOCALBASE}/include/oce" \
+ -DOCC_INCLUDE_DIR="${LOCALBASE}/include/oce" \
-DKICAD_SCRIPTING_PYTHON3=ON \
-DKICAD_SCRIPTING_WXPYTHON=OFF
blob - c40db39fc7439ce673923d313de6cdf9e8d04d45
file + cad/kicad/distinfo
--- cad/kicad/distinfo
+++ cad/kicad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad-5.1.10.tar.gz) = KWNB8wraLH9KHFRyDqtCWDWpM0lSfUvwj3PygNGWle0=
-SIZE (kicad-5.1.10.tar.gz) = 23785350
+SHA256 (kicad-5.1.12.tar.gz) = EBzAJeVcs8wEfevl5LGsH6EWzu0Uf+8bwnXY4h92qj8=
+SIZE (kicad-5.1.12.tar.gz) = 23785717
blob - 78d6e85d00d5598b888d2e57ef74e214f4a81d0c
file + cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists_txt
--- cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists_txt
+++ cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists_txt
@@ -13,5 +13,5 @@ Index: 3d-viewer/3d_cache/sg/CMakeLists.txt
+ c
+ ${wxWidgets_LIBRARIES} )
- install( TARGETS
- kicad_3dsg
+ # Don't specify the ARCHIVE DESTINATION parameter to prevent
+ # the install of the import library on Windows
blob - /dev/null
file + cad/kicad/patches/patch-CMakeModules_Findngspice_cmake
--- /dev/null
+++ cad/kicad/patches/patch-CMakeModules_Findngspice_cmake
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: CMakeModules/Findngspice.cmake
+--- CMakeModules/Findngspice.cmake.orig
++++ CMakeModules/Findngspice.cmake
+@@ -64,11 +64,11 @@ find_path( NGSPICE_INCLUDE_DIR ngspice/sharedspice.h
+ share/ngspice/include/ngspice
+ )
+
+-if( UNIX )
+- set( NGSPICE_LIB_NAME libngspice.so.0 CACHE STRING "Optionally versioned
name of the shared library" )
+-else()
++#if( UNIX )
++# set( NGSPICE_LIB_NAME libngspice.so.0 CACHE STRING "Optionally versioned
name of the shared library" )
++#else()
+ set( NGSPICE_LIB_NAME ngspice CACHE STRING "Optionally versioned name of
the shared library" )
+-endif()
++#endif()
+
+ find_library( NGSPICE_LIBRARY ${NGSPICE_LIB_NAME}
+ PATHS
blob - d5c2b0d20d951c755a1c9cf77415f061844aa383
file + cad/kicad/patches/patch-common_CMakeLists_txt
--- cad/kicad/patches/patch-common_CMakeLists_txt
+++ cad/kicad/patches/patch-common_CMakeLists_txt
@@ -3,7 +3,7 @@ $OpenBSD: patch-common_CMakeLists_txt,v 1.2 2020/04/02
Index: common/CMakeLists.txt
--- common/CMakeLists.txt.orig
+++ common/CMakeLists.txt
-@@ -597,7 +597,7 @@ add_dependencies( common page_layout_lexer_source_file
+@@ -598,7 +598,7 @@ add_dependencies( common page_layout_lexer_source_file
# This one gets made only when testing.
# to build it, first enable #define STAND_ALONE at top of dsnlexer.cpp
add_executable( dsntest EXCLUDE_FROM_ALL dsnlexer.cpp )
blob - 266fbb0c47b041d6a64c3d24086f4586f5be5b7e
file + cad/kicad-share/Makefile.inc
--- cad/kicad-share/Makefile.inc
+++ cad/kicad-share/Makefile.inc
@@ -4,7 +4,7 @@ NOT_FOR_ARCHS = powerpc
PKG_ARCH ?= *
-V ?= 5.1.10
+V ?= 5.1.12
EXTRACT_SUFX ?= .tar.bz2
DISTNAME= kicad-${KICAD_PROJECT}-$V
blob - b3ea00bafb1497dea16c88982f2d15bef73ec7d8
file + cad/kicad-share/footprints/distinfo
--- cad/kicad-share/footprints/distinfo
+++ cad/kicad-share/footprints/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad-footprints-5.1.10.tar.bz2) =
ZwfRx59XowV3PtjBaXHSI65wT94+bCOJWHEb5BvsiXU=
-SIZE (kicad-footprints-5.1.10.tar.bz2) = 3382220
+SHA256 (kicad-footprints-5.1.12.tar.bz2) =
LzLbeYa/18nUJCBULYNzPCemBCcGl+kMmv+hWgzEcHo=
+SIZE (kicad-footprints-5.1.12.tar.bz2) = 3382783
blob - cbdb016135e802b04a5b0a55fba860f9c0480a3f
file + cad/kicad-share/i18n/Makefile
--- cad/kicad-share/i18n/Makefile
+++ cad/kicad-share/i18n/Makefile
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.5 2021/10/20 11:47:48 sthen Exp $
-REVISION = 0
-
KICAD_PROJECT = i18n
COMMENT = language translations for KiCad
blob - c443a503a8a6e1a94b381c76d3aa083b7d5d17e7
file + cad/kicad-share/i18n/distinfo
--- cad/kicad-share/i18n/distinfo
+++ cad/kicad-share/i18n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad-i18n-5.1.10.tar.bz2) =
zDNT+Ayp+Aq/upUbRV51qdGmoLzDCFpUFthgZfRnTIg=
-SIZE (kicad-i18n-5.1.10.tar.bz2) = 2934783
+SHA256 (kicad-i18n-5.1.12.tar.bz2) =
oXzy6L4R71fXSG9fU66I6YbBQubOQ9IXU9/iT62f6S0=
+SIZE (kicad-i18n-5.1.12.tar.bz2) = 2934525
blob - 3e888432122360f78dac064470f943b355638e76
file + cad/kicad-share/packages3D/distinfo
--- cad/kicad-share/packages3D/distinfo
+++ cad/kicad-share/packages3D/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad-packages3D-5.1.10.tar.bz2) =
WwISj8tf9p+clGi2h2199orODu+1U1n28342663TKgs=
-SIZE (kicad-packages3D-5.1.10.tar.bz2) = 727194444
+SHA256 (kicad-packages3D-5.1.12.tar.bz2) =
z3dsHMdvnA8pAREb80NQ/MXdqyDmWPB9FQuBMGEHZi4=
+SIZE (kicad-packages3D-5.1.12.tar.bz2) = 727191578
blob - 9af73dd3b1ced81907ccf3693b4261b6b13af95a
file + cad/kicad-share/symbols/distinfo
--- cad/kicad-share/symbols/distinfo
+++ cad/kicad-share/symbols/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad-symbols-5.1.10.tar.bz2) =
y/cTlKjxMMNIBHHhfpCBYxGuPJyj+RaABRHi8Wp7UoU=
-SIZE (kicad-symbols-5.1.10.tar.bz2) = 1815573
+SHA256 (kicad-symbols-5.1.12.tar.bz2) =
qytC3gyoLBk98UHkiDoZsaFuUzXxWWT5AGsQHqpMj5E=
+SIZE (kicad-symbols-5.1.12.tar.bz2) = 1815145
blob - c50a3d12566b0f4b283d1fe1fc679f99f7238b6e
file + cad/kicad-share/templates/Makefile
--- cad/kicad-share/templates/Makefile
+++ cad/kicad-share/templates/Makefile
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.2 2021/10/20 11:47:48 sthen Exp $
-REVISION = 0
-
KICAD_PROJECT = templates
COMMENT = templates for KiCad
blob - 7e76dbc34d0e3159295a51fb4d6950daa65e56bb
file + cad/kicad-share/templates/distinfo
--- cad/kicad-share/templates/distinfo
+++ cad/kicad-share/templates/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kicad-templates-5.1.10.tar.bz2) =
wC9RbxX6yJx3jMPpDKLFO/spPrmFZskLI/S/G+lCouI=
-SIZE (kicad-templates-5.1.10.tar.bz2) = 1552124
+SHA256 (kicad-templates-5.1.12.tar.bz2) =
Svz4cbfwxtVdB9648TEGhhSVphZv1J7dixi12VKXThY=
+SIZE (kicad-templates-5.1.12.tar.bz2) = 1552173
