Hello, I've updated kicad from version 5.1.7 to version 5.1.10.
The diff below patches cad/kicad and cad/kicad-share. Software changes: 5.1.8: https://gitlab.com/groups/kicad/-/milestones/3 5.1.9: https://gitlab.com/groups/kicad/-/milestones/4 5.1.10: https://gitlab.com/groups/kicad/-/milestones/5 Port changes: - bumped version - upstream moved to gitlab, so -GH_*, +MASTER_SITES - adapt patches The version number was patched into CreateGitVersionHeader.cmake. This is not necessary, because the system has a fallback. I removed the patch and added a new one which avoids the inclusion of CreateGitVersionHeader.cmake. This activates the fallback and the version is set to the release version string. The subpackage kicad-package3D was created as kicad-package3d after the move to MASTER_SITES and gitlab. So I set PKGNAME to fix this. Also the release tarball unpacks into a folder with commit hash. I adapted WRKSRC accordingly. port-lib-depends-check and portcheck are happy on kicad and the 5 kicad-share sub-ports. Tested on amd64. OK? Best Regards, Stefan 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 13 Jul 2021 18:23:12 -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 13 Jul 2021 18:23:12 -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-CMakeModules_CreateGitVersionHeader_cmake =================================================================== RCS file: cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake diff -N cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake --- cad/kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake 19 Feb 2021 14:48:58 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,57 +0,0 @@ -$OpenBSD: patch-CMakeModules_CreateGitVersionHeader_cmake,v 1.1 2021/02/19 14:48:58 tracey Exp $ - -# set build version without git - -Index: CMakeModules/CreateGitVersionHeader.cmake ---- CMakeModules/CreateGitVersionHeader.cmake.orig -+++ CMakeModules/CreateGitVersionHeader.cmake -@@ -24,31 +24,31 @@ - - macro( create_git_version_header _git_src_path ) - # Include Git support to automagically create version header file. -- find_package( Git ) -+ # find_package( Git ) - -- if( GIT_FOUND ) -- message( STATUS "Using Git to determine build version string." ) -+ # if( GIT_FOUND ) -+ # message( STATUS "Using Git to determine build version string." ) - -- set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" ) -- set( ENV{LC_ALL} C ) -+ # set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" ) -+ # set( ENV{LC_ALL} C ) - - # Use `git describe --dirty` to create the KiCad version string. -- execute_process( -- COMMAND -- ${GIT_EXECUTABLE} describe --dirty -- WORKING_DIRECTORY ${_git_src_path} -- OUTPUT_VARIABLE _git_DESCRIBE -- ERROR_VARIABLE _git_log_error -- RESULT_VARIABLE _git_log_result -- OUTPUT_STRIP_TRAILING_WHITESPACE) -+ # execute_process( -+ # COMMAND -+ # ${GIT_EXECUTABLE} describe --dirty -+ # WORKING_DIRECTORY ${_git_src_path} -+ # OUTPUT_VARIABLE _git_DESCRIBE -+ # ERROR_VARIABLE _git_log_error -+ # RESULT_VARIABLE _git_log_result -+ # OUTPUT_STRIP_TRAILING_WHITESPACE) - -- set( ENV{LC_ALL} ${_Git_SAVED_LC_ALL} ) -- endif( GIT_FOUND ) -+ # set( ENV{LC_ALL} ${_Git_SAVED_LC_ALL} ) -+ # endif( GIT_FOUND ) - - # Check to make sure 'git' command did not fail. Otherwise fallback - # to KiCadVersion.cmake as the revision level. -- if( _git_DESCRIBE ) -- set( KICAD_VERSION "(${_git_DESCRIBE})" ) -- endif() -+ # if( _git_DESCRIBE ) -+ set( KICAD_VERSION "5.1.7" ) -+ # endif() - - endmacro() Index: cad/kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake =================================================================== RCS file: cad/kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake diff -N cad/kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cad/kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake 13 Jul 2021 18:23:12 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: CMakeModules/KiCadFullVersion.cmake +--- CMakeModules/KiCadFullVersion.cmake.orig ++++ CMakeModules/KiCadFullVersion.cmake +@@ -28,8 +28,8 @@ + # 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 ) +-create_git_version_header( ${SRC_PATH} ) ++#include( ${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). + set( KICAD_VERSION_FULL "${KICAD_VERSION}" ) 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 13 Jul 2021 18:23:12 -0000 @@ -12,45 +12,21 @@ Index: pcbnew/CMakeLists.txt endif() -@@ -805,11 +805,7 @@ if( KICAD_SCRIPTING_MODULES ) +@@ -805,7 +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_OBJECTS:pcbnew_kiface_objects> ) -- 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}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" ) + 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 +@@ -823,7 +823,7 @@ if( KICAD_SCRIPTING_MODULES ) + # 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} + 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() + COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use." + ) + add_custom_target( Index: cad/kicad/pkg/PLIST =================================================================== RCS file: /cvs/ports/cad/kicad/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- cad/kicad/pkg/PLIST 19 Feb 2021 14:48:58 -0000 1.4 +++ cad/kicad/pkg/PLIST 13 Jul 2021 18:23:12 -0000 @@ -256,6 +256,7 @@ share/kicad/demos/simulation/pspice/sche share/kicad/demos/simulation/pspice/schematic_libspice.lib share/kicad/demos/simulation/pspice/sym-lib-table share/kicad/demos/simulation/rectifier/ +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 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 13 Jul 2021 18:23:12 -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 13 Jul 2021 18:23:12 -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 13 Jul 2021 18:23:12 -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 13 Jul 2021 18:23:12 -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 <bsd.port.mk> 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 13 Jul 2021 18:23:12 -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 13 Jul 2021 18:23:12 -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 13 Jul 2021 18:23:12 -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
