On Wed, Jul 14, 2021 at 01:04:38AM +0200, Stefan Hagen wrote:
> 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.
Thanks for the diff! The diff below is what was commited with help from
sthen@. (As always, thanks.)
>
> 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.
This was not needed. Using the :L in the distname was grabbing the wrong
file. Also, the extension in kicad-share was changed to grab smaller
files.
>
> port-lib-depends-check and portcheck are happy on kicad and the 5
> kicad-share sub-ports. Tested on amd64.
>
> OK?
>
> Best Regards,
> Stefan
>
Thanks again!
--
Tracey Emery
Index: kicad/Makefile
===================================================================
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.45
diff -u -p -u -r1.45 Makefile
--- kicad/Makefile 23 Feb 2021 19:39:10 -0000 1.45
+++ kicad/Makefile 14 Jul 2021 16:20:49 -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: kicad/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- kicad/distinfo 19 Feb 2021 14:48:58 -0000 1.9
+++ kicad/distinfo 14 Jul 2021 16:20:49 -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: kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake
===================================================================
RCS file: kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake
diff -N kicad/patches/patch-CMakeModules_CreateGitVersionHeader_cmake
--- 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: kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake
===================================================================
RCS file: kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake
diff -N kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kicad/patches/patch-CMakeModules_KiCadFullVersion_cmake 14 Jul 2021
16:20:49 -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: 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 -r1.4 patch-pcbnew_CMakeLists_txt
--- kicad/patches/patch-pcbnew_CMakeLists_txt 19 Feb 2021 14:48:58 -0000
1.4
+++ kicad/patches/patch-pcbnew_CMakeLists_txt 14 Jul 2021 16:20:49 -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: kicad/pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/kicad/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- kicad/pkg/PLIST 19 Feb 2021 14:48:58 -0000 1.4
+++ kicad/pkg/PLIST 14 Jul 2021 16:20:49 -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: kicad-share/Makefile.inc
===================================================================
RCS file: /cvs/ports/cad/kicad-share/Makefile.inc,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.inc
--- kicad-share/Makefile.inc 19 Feb 2021 14:48:11 -0000 1.6
+++ kicad-share/Makefile.inc 14 Jul 2021 16:20:49 -0000
@@ -4,15 +4,17 @@ NOT_FOR_ARCHS = powerpc
PKG_ARCH ?= *
-V ?= 5.1.7
+V ?= 5.1.10
+EXTRACT_SUFX ?= .tar.bz2
+
+DISTNAME= kicad-${KICAD_PROJECT}-$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}/-/archive/$V/
# CC-BY-SA 4.0
PERMIT_PACKAGE ?= Yes
Index: kicad-share/footprints/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/footprints/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- kicad-share/footprints/distinfo 19 Feb 2021 14:48:11 -0000 1.3
+++ kicad-share/footprints/distinfo 14 Jul 2021 16:20:49 -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.bz2) =
ZwfRx59XowV3PtjBaXHSI65wT94+bCOJWHEb5BvsiXU=
+SIZE (kicad-footprints-5.1.10.tar.bz2) = 3382220
Index: kicad-share/i18n/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/i18n/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- kicad-share/i18n/distinfo 19 Feb 2021 14:48:11 -0000 1.3
+++ kicad-share/i18n/distinfo 14 Jul 2021 16:20:49 -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.bz2) =
zDNT+Ayp+Aq/upUbRV51qdGmoLzDCFpUFthgZfRnTIg=
+SIZE (kicad-i18n-5.1.10.tar.bz2) = 2934783
Index: kicad-share/packages3D/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/packages3D/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- kicad-share/packages3D/distinfo 19 Feb 2021 14:48:11 -0000 1.3
+++ kicad-share/packages3D/distinfo 14 Jul 2021 16:20:49 -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.bz2) =
WwISj8tf9p+clGi2h2199orODu+1U1n28342663TKgs=
+SIZE (kicad-packages3D-5.1.10.tar.bz2) = 727194444
Index: kicad-share/symbols/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/symbols/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- kicad-share/symbols/distinfo 19 Feb 2021 14:48:12 -0000 1.3
+++ kicad-share/symbols/distinfo 14 Jul 2021 16:20:49 -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.bz2) =
y/cTlKjxMMNIBHHhfpCBYxGuPJyj+RaABRHi8Wp7UoU=
+SIZE (kicad-symbols-5.1.10.tar.bz2) = 1815573
Index: kicad-share/templates/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/templates/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- kicad-share/templates/distinfo 19 Feb 2021 14:48:12 -0000 1.3
+++ kicad-share/templates/distinfo 14 Jul 2021 16:20:49 -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.bz2) =
wC9RbxX6yJx3jMPpDKLFO/spPrmFZskLI/S/G+lCouI=
+SIZE (kicad-templates-5.1.10.tar.bz2) = 1552124
