Thanks - these are OK with me to import.
On 2025/02/08 20:17, Johannes Thyssen Tishman wrote:
> 2025-02-08T19:34:40+0000 Stuart Henderson <s...@spacehopper.org>:
> > On 2025/02/08 18:48, Johannes Thyssen Tishman wrote:
> > > Please find attached ports for math/{cgns,exprtk,verdict} and
> > > devel/cli11. These ports are required by graphics/vtk which in turn is
> > > required by cad/freecad, a port I intend to submit once it's
> > > dependencies have been comitted. Since graphics/vtk is quite large, I'll
> > > send it on it's own once it's dependencies have been imported.
> >
> > verdict: base-gcc will never be used for a cmake port, might as
> > well use just "base-clang ports-gcc".
>
> I keep forgetting this, thanks Stuart.
>
> > maybe lose the versioned dir from share/doc/verdict/1.4.2/ (mv/rmdir
> > in post-install would do).
>
> I opted for a patch here as I was already modifying that path in
> CONFIGURE_ARGS. Two birds, one stone.
>
> > cli11: missing COMPILER. maybe use https://cliutils.github.io/CLI11/book/
> > for HOMEPAGE?
> >
> > exprtk: maybe lose the capitals in COMMENT?
> >
> > otherwise ok. (personally I would also switch to GH_* here. DIST_TUPLE
> > is handy for submodules and non-github sites but portroach doesn't like
> > it).
>
> Perhaps this should be documented in Makefile.template? Currently it
> suggests DIST_TUPLE for tarballs from tags.
>
> Please find an updated tarball attached with all comments addressed as
> shown in the diff below.
>
> diff /usr/ports/mystuff
> path + /usr/ports/mystuff
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - cba917cf4e3f68fc10e04e73a0ad2a67ae30edee
> file + devel/cli11/Makefile
> --- devel/cli11/Makefile
> +++ devel/cli11/Makefile
> @@ -2,14 +2,18 @@ COMMENT = command line parser for C++11
>
> PKGNAME = ${DISTNAME:L}
>
> -DIST_TUPLE += github CLIUtils CLI11 v2.4.2 .
> +GH_ACCOUNT = CLIUtils
> +GH_PROJECT = CLI11
> +GH_TAGNAME = v2.4.2
>
> CATEGORIES = devel
> +HOMEPAGE = https://cliutils.github.io/CLI11/book/
> MAINTAINER = Johannes Thyssen Tishman <po...@thyssentishman.com>
>
> # BSD 3-clause
> PERMIT_PACKAGE = Yes
>
> +COMPILER = base-clang ports-gcc
> MODULES = devel/cmake
>
> BUILD_DEPENDS = devel/boost \
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - a9f7e090888fdbb13cea3930acf1caf7c36c6a15
> file + devel/cli11/distinfo
> --- devel/cli11/distinfo
> +++ devel/cli11/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (CLIUtils-CLI11-v2.4.2.tar.gz) =
> 8tiTplw7EyTFDU5oLAzcAh3QR3riwEhUTznu1mVLaZo=
> -SIZE (CLIUtils-CLI11-v2.4.2.tar.gz) = 343478
> +SHA256 (CLI11-2.4.2.tar.gz) = 8tiTplw7EyTFDU5oLAzcAh3QR3riwEhUTznu1mVLaZo=
> +SIZE (CLI11-2.4.2.tar.gz) = 343478
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - 9f516e13c2a24003c95bc84ce2e5359e7eba885c
> file + math/cgns/Makefile
> --- math/cgns/Makefile
> +++ math/cgns/Makefile
> @@ -1,6 +1,8 @@
> COMMENT = CFD General Notation System standard library
>
> -DIST_TUPLE += github CGNS CGNS v4.5.0 .
> +GH_ACCOUNT = CGNS
> +GH_PROJECT = CGNS
> +GH_TAGNAME = v4.5.0
>
> SHARED_LIBS += cgns 0.0 # 0.0
>
> @@ -13,6 +15,7 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += c hdf5 m z
>
> +COMPILER = base-clang ports-gcc
> MODULES = devel/cmake
>
> LIB_DEPENDS = math/hdf5
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - a184feb5948a20faea4dc1fe1323975afeb66c54
> file + math/cgns/distinfo
> --- math/cgns/distinfo
> +++ math/cgns/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (CGNS-CGNS-v4.5.0.tar.gz) =
> xyNVIZMYdVugqGRqjlbuHBOM+QnB1zjSWNJ3T6S1Kek=
> -SIZE (CGNS-CGNS-v4.5.0.tar.gz) = 2085289
> +SHA256 (CGNS-4.5.0.tar.gz) = xyNVIZMYdVugqGRqjlbuHBOM+QnB1zjSWNJ3T6S1Kek=
> +SIZE (CGNS-4.5.0.tar.gz) = 2085289
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - e6dda7bb096b99f1acbafa248bd60aad767abcb4
> file + math/exprtk/Makefile
> --- math/exprtk/Makefile
> +++ math/exprtk/Makefile
> @@ -1,6 +1,8 @@
> -COMMENT = C++ Mathematical Expression Parsing And Evaluation
> Library
> +COMMENT = c++ mathematical expression parsing and evaluation
> library
>
> -DIST_TUPLE += github ArashPartow exprtk 0.0.3 .
> +GH_ACCOUNT = ArashPartow
> +GH_PROJECT = exprtk
> +GH_TAGNAME = 0.0.3
>
> CATEGORIES = math
> HOMEPAGE = https://www.partow.net/programming/exprtk/
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - e6f2d2f847eaa177bc3a1c53be83ef1c002ff0f7
> file + math/exprtk/distinfo
> --- math/exprtk/distinfo
> +++ math/exprtk/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (ArashPartow-exprtk-0.0.3.tar.gz) =
> +d7Gl16GxwIDPWplupoDaOujGmG4nXTytdJEV8AshDk=
> -SIZE (ArashPartow-exprtk-0.0.3.tar.gz) = 1533147
> +SHA256 (exprtk-0.0.3.tar.gz) = +d7Gl16GxwIDPWplupoDaOujGmG4nXTytdJEV8AshDk=
> +SIZE (exprtk-0.0.3.tar.gz) = 1533147
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - 3eaa5db0214aad5ac05ae8e58e74671e7d0b8729
> file + math/verdict/Makefile
> --- math/verdict/Makefile
> +++ math/verdict/Makefile
> @@ -1,6 +1,8 @@
> COMMENT = compute quality functions of 2 and 3-dimensional regions
>
> -DIST_TUPLE += github sandialabs verdict 1.4.2 .
> +GH_ACCOUNT = sandialabs
> +GH_PROJECT = verdict
> +GH_TAGNAME = 1.4.2
>
> SHARED_LIBS += verdict 0.0 # 0.0
>
> @@ -12,12 +14,11 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} m
>
> -COMPILER = base-clang ports-gcc base-gcc
> +COMPILER = base-clang ports-gcc
> MODULES = devel/cmake
>
> BUILD_DEPENDS = devel/gtest
>
> -CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON \
> - -Dverdict_INSTALL_DOC_DIR=${LOCALBASE}/share/doc
> +CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON
>
> .include <bsd.port.mk>
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - a859d4268f3c738cfcc94bf335ac3f2fc03def9b
> file + math/verdict/distinfo
> --- math/verdict/distinfo
> +++ math/verdict/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (sandialabs-verdict-1.4.2.tar.gz) =
> IlyMUxj0sC5yFc76YbXcP5ngUUetP+/m7lo+5bgolks=
> -SIZE (sandialabs-verdict-1.4.2.tar.gz) = 2195976
> +SHA256 (verdict-1.4.2.tar.gz) = IlyMUxj0sC5yFc76YbXcP5ngUUetP+/m7lo+5bgolks=
> +SIZE (verdict-1.4.2.tar.gz) = 2195976
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - /dev/null
> file + math/verdict/patches/patch-CMakeLists_txt (mode 644)
> --- /dev/null
> +++ math/verdict/patches/patch-CMakeLists_txt
> @@ -0,0 +1,12 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -121,7 +121,7 @@ endif ()
> + # Install documentation
> + install(FILES
> + README.md
> +- DESTINATION ${verdict_INSTALL_DOC_DIR}/verdict/${verdict_VERSION}/
> COMPONENT VerdictDevelopment)
> ++ DESTINATION ${verdict_INSTALL_DOC_DIR}/ COMPONENT VerdictDevelopment)
> +
> + # Install required header files
> + install(FILES
> commit - 399e4e92176bc1a764491e094f897c4caf0b24dd
> blob - 4a0e5b1ea2c6b360d62d20cb6f4db9908f1004f4
> file + math/verdict/pkg/PLIST
> --- math/verdict/pkg/PLIST
> +++ math/verdict/pkg/PLIST
> @@ -8,5 +8,4 @@ lib/cmake/verdict/VerdictTargets${MODCMAKE_BUILD_SUFFI
> lib/cmake/verdict/VerdictTargets.cmake
> @lib lib/libverdict.so.${LIBverdict_VERSION}
> share/doc/verdict/
> -share/doc/verdict/1.4.2/
> -share/doc/verdict/1.4.2/README.md
> +share/doc/verdict/README.md
