Index: cad/kicad/Makefile =================================================================== RCS file: /cvs/ports/cad/kicad/Makefile,v retrieving revision 1.45 diff -u -p -u -p -r1.45 Makefile --- cad/kicad/Makefile 23 Feb 2021 19:39:10 -0000 1.45 +++ cad/kicad/Makefile 11 Jul 2021 20:24:41 -0000 @@ -3,7 +3,7 @@ # Sync cad/kicad-share/Makefile.inc with archs where kicad is broken BROKEN-powerpc = segfaults when trying to run the PCB editor -V = 5.1.7 +V = 5.1.10 COMMENT = schematic and PCB editing software DISTNAME = kicad-${V} EPOCH = 0 Index: cad/kicad/distinfo =================================================================== RCS file: /cvs/ports/cad/kicad/distinfo,v retrieving revision 1.9 diff -u -p -u -p -r1.9 distinfo --- cad/kicad/distinfo 19 Feb 2021 14:48:58 -0000 1.9 +++ cad/kicad/distinfo 11 Jul 2021 20:24:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (kicad-5.1.7.tar.gz) = lq0wqiie1vd//NgoPQh3twATkYfl8ZV6ytitTbrUcrw= -SIZE (kicad-5.1.7.tar.gz) = 23795576 +SHA256 (kicad-5.1.10.tar.gz) = KWNB8wraLH9KHFRyDqtCWDWpM0lSfUvwj3PygNGWle0= +SIZE (kicad-5.1.10.tar.gz) = 23785350 Index: cad/kicad/patches/patch-CMakeLists_txt =================================================================== RCS file: cad/kicad/patches/patch-CMakeLists_txt diff -N cad/kicad/patches/patch-CMakeLists_txt --- cad/kicad/patches/patch-CMakeLists_txt 19 Feb 2021 14:48:58 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.5 2021/02/19 14:48:58 tracey Exp $ -# assign proper lib name and add boost check -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -409,12 +409,12 @@ if( false ) - set( KIFACE_SUFFIX ${CMAKE_SHARED_MODULE_SUFFIX} ) - else() - # Temporary situation until we can dovetail the python DSO into the kiface DSO. -- set( KIFACE_SUFFIX ".kiface" ) -+ set( KIFACE_SUFFIX ".a" ) - endif() - - # KIFACE_PREFIX is a basename prefix used for top level program modules which - # implement the KIFACE. --set( KIFACE_PREFIX "_" ) -+set( KIFACE_PREFIX "lib" ) - #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX} KIFACE_PREFIX:${KIFACE_PREFIX}" ) - - -@@ -582,7 +582,7 @@ find_package( Pixman 0.30 REQUIRED ) - - # - # Find Boost headers, required. --find_package( Boost 1.54.0 REQUIRED ) -+find_package( Boost 1.54.0 REQUIRED COMPONENTS context system ) - - # Include MinGW resource compiler. - include( MinGWResourceCompiler ) Index: cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake =================================================================== RCS file: /cvs/ports/cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-CMakeModules_CreateGitVersionHeader_cmake --- cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake 19 Feb 2021 14:48:58 -0000 1.1 +++ cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake 11 Jul 2021 20:24:41 -0000 @@ -51,7 +51,7 @@ Index: CMakeModules/CreateGitVersionHead - set( KICAD_VERSION "(${_git_DESCRIBE})" ) - endif() + # if( _git_DESCRIBE ) -+ set( KICAD_VERSION "5.1.7" ) ++ set( KICAD_VERSION "5.1.10" ) + # endif() endmacro() Index: cad/kicad/patches/patch-pcbnew_CMakeLists_txt =================================================================== RCS file: /cvs/ports/cad/kicad/patches/patch-pcbnew_CMakeLists_txt,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-pcbnew_CMakeLists_txt --- cad/kicad/patches/patch-pcbnew_CMakeLists_txt 19 Feb 2021 14:48:58 -0000 1.4 +++ cad/kicad/patches/patch-pcbnew_CMakeLists_txt 11 Jul 2021 20:24:41 -0000 @@ -12,45 +12,3 @@ Index: pcbnew/CMakeLists.txt endif() -@@ -805,11 +805,7 @@ if( KICAD_SCRIPTING_MODULES ) - add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation ) - set( PYMOD_EXT "so" ) - else() # only linux remains among supported platforms -- add_library( pcbnew_python MODULE $ ) -- target_link_libraries( pcbnew_python ${PCBNEW_KIFACE_LIBRARIES} ) -- set_target_properties( pcbnew_python PROPERTIES OUTPUT_NAME pcbnew PREFIX "_" SUFFIX ".so" ) -- install( TARGETS pcbnew_python DESTINATION ${PYTHON_DEST} COMPONENT binary ) -- -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcbnew.a DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" ) - set( PYMOD_EXT "so" ) - endif() - -@@ -824,18 +820,16 @@ if( KICAD_SCRIPTING_MODULES ) - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} - ) - else() -- -- -- # For phase 1, copy _pcbnew.kiface to the python module. -- add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} -- DEPENDS pcbnew_kiface -- COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT} -- COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use." -- ) -- add_custom_target( -- pcbnew_python_module ALL -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} -- ) -+ # For phase 1, copy _pcbnew.kiface to the python module. -+ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} -+ DEPENDS pcbnew_kiface -+ COMMAND ${CMAKE_COMMAND} -E copy libpcbnew.a _pcbnew.${PYMOD_EXT} -+ COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use." -+ ) -+ add_custom_target( -+ pcbnew_python_module ALL -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} -+ ) - endif() - - endif() Index: cad/kicad-share/Makefile.inc =================================================================== RCS file: /cvs/ports/cad/kicad-share/Makefile.inc,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile.inc --- cad/kicad-share/Makefile.inc 19 Feb 2021 14:48:11 -0000 1.6 +++ cad/kicad-share/Makefile.inc 11 Jul 2021 20:24:41 -0000 @@ -4,15 +4,16 @@ NOT_FOR_ARCHS = powerpc PKG_ARCH ?= * -V ?= 5.1.7 +V ?= 5.1.10 + +DISTNAME= kicad-${KICAD_PROJECT:L}-$V CATEGORIES ?= cad HOMEPAGE ?= https://kicad.github.io/${KICAD_PROJECT:L}/ -GH_ACCOUNT ?= KiCad -GH_PROJECT ?= kicad-${KICAD_PROJECT} -GH_TAGNAME ?= $V +MASTER_SITES ?= \ + https://gitlab.com/kicad/libraries/kicad-${KICAD_PROJECT:L}/-/archive/$V/ # CC-BY-SA 4.0 PERMIT_PACKAGE ?= Yes Index: cad/kicad-share/footprints/distinfo =================================================================== RCS file: /cvs/ports/cad/kicad-share/footprints/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- cad/kicad-share/footprints/distinfo 19 Feb 2021 14:48:11 -0000 1.3 +++ cad/kicad-share/footprints/distinfo 11 Jul 2021 20:24:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (kicad-footprints-5.1.7.tar.gz) = JyDgCShfuvpEIWQXxx1DiDM5jMtKI9nGzOhhcJg4F/o= -SIZE (kicad-footprints-5.1.7.tar.gz) = 6035007 +SHA256 (kicad-footprints-5.1.10.tar.gz) = Zd5QqWaeXrDy5O7UM4AkMu7ivZjfHomJBafcEXzbMFA= +SIZE (kicad-footprints-5.1.10.tar.gz) = 6032606 Index: cad/kicad-share/i18n/distinfo =================================================================== RCS file: /cvs/ports/cad/kicad-share/i18n/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- cad/kicad-share/i18n/distinfo 19 Feb 2021 14:48:11 -0000 1.3 +++ cad/kicad-share/i18n/distinfo 11 Jul 2021 20:24:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (kicad-i18n-5.1.7.tar.gz) = vnL8RIjYthSyt5l2aWQdCt6r5okIMlO1xr+5mFMXFUI= -SIZE (kicad-i18n-5.1.7.tar.gz) = 4670991 +SHA256 (kicad-i18n-5.1.10.tar.gz) = 8H4Clxe/vwtUxZy/GR4bKzXMzSdsn6xFQjmySeCST9w= +SIZE (kicad-i18n-5.1.10.tar.gz) = 4340544 Index: cad/kicad-share/packages3D/Makefile =================================================================== RCS file: /cvs/ports/cad/kicad-share/packages3D/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 Makefile --- cad/kicad-share/packages3D/Makefile 3 Oct 2019 07:58:04 -0000 1.1.1.1 +++ cad/kicad-share/packages3D/Makefile 11 Jul 2021 20:24:41 -0000 @@ -3,4 +3,9 @@ KICAD_PROJECT = packages3D COMMENT = 3D packages for KiCad +PKGNAME = kicad-packages3D-${V} + +COMMIT = -7abe02f30fd79b8f4f66c01589861df7f8f72f04 +WRKSRC = ${WRKDIR}/kicad-packages3D-${V}${COMMIT} + .include Index: cad/kicad-share/packages3D/distinfo =================================================================== RCS file: /cvs/ports/cad/kicad-share/packages3D/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- cad/kicad-share/packages3D/distinfo 19 Feb 2021 14:48:11 -0000 1.3 +++ cad/kicad-share/packages3D/distinfo 11 Jul 2021 20:24:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (kicad-packages3D-5.1.7.tar.gz) = VCDtapzrsVxwIQxjPQcQ8KiexDyi7xEcBDmTDIFWAGw= -SIZE (kicad-packages3D-5.1.7.tar.gz) = 942594575 +SHA256 (kicad-packages3d-5.1.10.tar.gz) = LN92k6tdayNqe1a8brv1dTJDwvlnIDshsHPaDDfxh0U= +SIZE (kicad-packages3d-5.1.10.tar.gz) = 942955426 Index: cad/kicad-share/symbols/distinfo =================================================================== RCS file: /cvs/ports/cad/kicad-share/symbols/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- cad/kicad-share/symbols/distinfo 19 Feb 2021 14:48:12 -0000 1.3 +++ cad/kicad-share/symbols/distinfo 11 Jul 2021 20:24:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (kicad-symbols-5.1.7.tar.gz) = q4/lplp8GpnZuF+CxWzHstvnfrN+KJRUgdzdrXN4tCU= -SIZE (kicad-symbols-5.1.7.tar.gz) = 3033099 +SHA256 (kicad-symbols-5.1.10.tar.gz) = XoDIQgpWPHbIhLJ3F5LOfuae++Z9EdmwJe6xa3Wu5F4= +SIZE (kicad-symbols-5.1.10.tar.gz) = 3033414 Index: cad/kicad-share/templates/distinfo =================================================================== RCS file: /cvs/ports/cad/kicad-share/templates/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- cad/kicad-share/templates/distinfo 19 Feb 2021 14:48:12 -0000 1.3 +++ cad/kicad-share/templates/distinfo 11 Jul 2021 20:24:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (kicad-templates-5.1.7.tar.gz) = BFSgiHLjnH9fA49ER2BuwF1+MnaEqDYcy3Hn49SXu7I= -SIZE (kicad-templates-5.1.7.tar.gz) = 1643946 +SHA256 (kicad-templates-5.1.10.tar.gz) = 8sRNbcafw8fbBfV8XK8pByHgu6P+aG5OO8J2Xj8xRmg= +SIZE (kicad-templates-5.1.10.tar.gz) = 1643956