From nobody Sat Oct 11 10:14:04 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ckKG72Vxrz6BbHK; Sat, 11 Oct 2025 10:14:07 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ckKG72HXyz3Y8p; Sat, 11 Oct 2025 10:14:07 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760177647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U8npAlTiqqicWshew6dmA2QHqP9Tvgba+y1KYALHLNE=; b=Diq7jY7IgxKIJ/nxsZdJj7Oa2gjC7KhAPvftFBCXNm0DTfUmEIxwRMbxnqnjHAIsQGYptu zWbAWi34byOzLfbPi1DUAdKFtPoOZFJEeqwxQFlSWPu2h9Qj+lc1+n/GbmGJmk9Hq5luiw kQHiqCerq560MBvCXXMs138yc/8uBd6JzMrgttbLYz+Nu4uY+l2j125xiiZ5LcQyWNxYzh y1kQW1H+bGPtBcDgQkURDVKzehRz6VjrvjmyMoxJ11Ie3N1jOPlRkiMZWV2B26MniUiEIG WxqgJweR+NVqnthqpQr4OduVjq6z7bB7c+ujW2WJJ8gzE8iyEXYNew4V9hOvOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760177647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U8npAlTiqqicWshew6dmA2QHqP9Tvgba+y1KYALHLNE=; b=dBKk2ICdrZu6t6s6BAYOH1sZm/e2tFiJyatzOJMRnIXp0BrNyBTAkKwS0ePZcvgrr/SCrH PKlyo4vMUJVIBf4SntJgBZPnl0h0CaoStzMlH9Nt70BPcXMnv/tHs0sL6o7VAB5f2t786T qEBRXq8H2sPhNlRI6Q4ZM1R4cFHRL8y8qRi63Aot1kt15E/Wv5UxrefxH9HTI0nGUOgeDW Qc2AcVV9t118rjo1n+YBbwz9sn+Q/+368Yx18cvChlEJ5SpivSSKQe8N0SAhqP8UthlJiw F3lWRfAmL1f1QqhLJaLIVjzQ2+bVOMzvDx4dYTNU354ti6hd02A3C0Q4/yz1aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760177647; a=rsa-sha256; cv=none; b=cW+csKDQWTOF1LTh521YE4gN3p6SHWOGwNwR1UBRu8RObjQnog/GAYOoYhZ5qQ20jyJCxX Hz2+BQao+iq4vT/a88USaFgn0VIDcnXXEJDuzmMRRI6w6o1rXvlQFMelkL4KAbuKSgvpVk T57sKVsSa0fSg62mvBUQsBTPPzER5tsg2GnpFCs4451GDaAovNOy1ti9BM42/8+5u6ELCa KQ+YgwiKi9omq0HOdwflQPVyr+l6xZcNWRw2v3DbB/luN3RNAkjv9PprX6z1JPGTQyQSSD yPxx8IzScgycn5vwGft+499V8zFSF7bpK7vYMY3oLpm7wL0wZPokYRmX6VQY9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.16] (217-209-194-237-no600.tbcn.telia.com [217.209.194.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: diizzy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ckKG63G5TzD83; Sat, 11 Oct 2025 10:14:06 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Content-Type: multipart/alternative; boundary="------------gnNRJoedLfMfg3O2fPdEk3WE" Message-ID: Date: Sat, 11 Oct 2025 12:14:04 +0200 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Betterbird (Windows) Subject: Re: git: 6996da7c3428 - main - =?utf-8?Q?math/cimod: update 1.6.2 =E2=86=92 1.7.3; Make tests run; Improve pkg-des= To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= , Yuri Victorovich Cc: "ports-committers@FreeBSD.org" , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202510110930.59B9UTxc049748@gitrepo.freebsd.org> Content-Language: en-US From: Daniel Engberg In-Reply-To: This is a multi-part message in MIME format. --------------gnNRJoedLfMfg3O2fPdEk3WE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-10-11 11:52, Fernando Apesteguía wrote: > > > El sáb, 11 oct 2025, 11:30, Yuri Victorovich escribió: > > cr?= > MIME-Version: 1.0 > Content-Type: text/plain; charset=utf-8 > Content-Transfer-Encoding: 8bit > X-Git-Committer: yuri > X-Git-Repository: ports > X-Git-Refname: refs/heads/main > X-Git-Reftype: branch > X-Git-Commit: 6996da7c342889e15fbdc7819b830ff8de82affa > Auto-Submitted: auto-generated > > > Hi Yuri, > > What does that auto-generated mean? > > > > The branch main has been updated by yuri: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=6996da7c342889e15fbdc7819b830ff8de82affa > > > commit 6996da7c342889e15fbdc7819b830ff8de82affa > Author:     Yuri Victorovich > AuthorDate: 2025-10-11 09:29:20 +0000 > Commit:     Yuri Victorovich > CommitDate: 2025-10-11 09:30:24 +0000 > >     math/cimod: update 1.6.2 → 1.7.3; Make tests run; Improve > pkg-descr > > > This commit message is a bit off I think. One thing is the commit > title and other the description. Probably after the first ';' > everything should be in the body of the message, IMO. > > --- >  math/cimod/Makefile                              |  9 +++-- >  math/cimod/distinfo                              |  6 +-- >  math/cimod/files/patch-external_googletest.cmake | 47 > ++++++++++++++++++++++++ >  math/cimod/pkg-descr                             |  9 ++++- >  4 files changed, 64 insertions(+), 7 deletions(-) > > diff --git a/math/cimod/Makefile b/math/cimod/Makefile > index da6b482a1457..811099f57455 100644 > --- a/math/cimod/Makefile > +++ b/math/cimod/Makefile > @@ -1,11 +1,12 @@ >  PORTNAME=      cimod >  DISTVERSIONPREFIX=     v > -DISTVERSION=   1.6.2 > +DISTVERSION=   1.7.3 >  CATEGORIES=    math > >  MAINTAINER= yuri@FreeBSD.org >  COMMENT=       C++ header-only library for a binary quadratic models > -WWW= https://github.com/OpenJij/cimod > +WWW= https://www.openjij.org/ \ > + https://github.com/Jij-Inc/cimod > >  LICENSE=       MIT >  LICENSE_FILE=  ${WRKSRC}/LICENSE > @@ -17,7 +18,7 @@ TEST_DEPENDS= googletest>0:devel/googletest >  USES=          cmake:testing compiler:c++17-lang eigen:3,build,run > >  USE_GITHUB=    yes > -GH_ACCOUNT=    OpenJij > +GH_ACCOUNT=    Jij-Inc > >  CMAKE_ON=      CIMOD_INSTALL # doesn't do anything, see > https://github.com/OpenJij/cimod/issues/103 >  CMAKE_OFF=     CIMOD_TEST CIMOD_DOCS > @@ -28,4 +29,6 @@ NO_ARCH=      yes >  do-install: # see https://github.com/OpenJij/cimod/issues/103 >         cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} > ${STAGEDIR}${PREFIX}/include > > +# tests as of 1.7.3: 100% tests passed, 0 tests failed out of 79 > + >  .include > > diff --git a/math/cimod/distinfo b/math/cimod/distinfo > index e344c4bc92de..785fc5b72f5c 100644 > --- a/math/cimod/distinfo > +++ b/math/cimod/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1709938110 > -SHA256 (OpenJij-cimod-v1.6.2_GH0.tar.gz) = > 732c10f68d90c9292b411c1148cf0be54b0fb812ec4aa4ba1102514486113ae1 > -SIZE (OpenJij-cimod-v1.6.2_GH0.tar.gz) = 139864 > +TIMESTAMP = 1760174868 > +SHA256 (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = > 066fe6187124da8a7ee250c060bce883828ae33f6e38a3525f72c71a6de44510 > +SIZE (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = 341035 > diff --git a/math/cimod/files/patch-external_googletest.cmake > b/math/cimod/files/patch-external_googletest.cmake > new file mode 100644 > index 000000000000..4a37cdd349ff > --- /dev/null > +++ b/math/cimod/files/patch-external_googletest.cmake > @@ -0,0 +1,47 @@ > +--- external/googletest.cmake.orig     2025-01-27 12:00:00 UTC > ++++ external/googletest.cmake > +@@ -14,38 +14,11 @@ > + > + include(FetchContent) > + > +-message(CHECK_START "Fetching GoogleTest") > +-list(APPEND CMAKE_MESSAGE_INDENT "  ") > +- > +-set(CMAKE_CXX_STANDARD 17) > +-set(FETCHCONTENT_QUIET OFF) > +- > +-#### Google test #### > +-FetchContent_Declare( > +-    googletest > +-    GIT_REPOSITORY https://github.com/google/googletest > +-    GIT_TAG         v1.17.0 > +-    GIT_SHALLOW     TRUE > +-) > +- > +-if(WIN32) > +-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) > +-endif() > +- > +-# Prevent googletest from being installed by using > FetchContent_Populate + add_subdirectory with EXCLUDE_FROM_ALL > +-FetchContent_GetProperties(googletest) > +-if(NOT googletest_POPULATED) > +-    FetchContent_Populate(googletest) > +-    add_subdirectory(${googletest_SOURCE_DIR} > ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) > +-endif() > +- > ++# Try to find pre-installed GoogleTest first > + find_package(GTest) > + > +-#FetchContent_GetProperties(googletest) > +- > +-#message(STATUS "gtest_SOURCE_DIR = ${gtest_SOURCE_DIR}") > +-#message(STATUS "gmock_SOURCE_DIR = ${gmock_SOURCE_DIR}") > +- > +- > +-list(POP_BACK CMAKE_MESSAGE_INDENT) > +-message(CHECK_PASS "fetched") > ++if(NOT GTest_FOUND) > ++    message(FATAL_ERROR "GoogleTest not found. Please install > googletest package.") > ++else() > ++    message(STATUS "Found pre-installed GoogleTest") > ++endif() > diff --git a/math/cimod/pkg-descr b/math/cimod/pkg-descr > index f588a9340f2f..eb48d39c4b1e 100644 > --- a/math/cimod/pkg-descr > +++ b/math/cimod/pkg-descr > @@ -1 +1,8 @@ > -cmod is a C++ library for a binary quadratic model. > +Cimod is a C++ header-only library for a binary quadratic model > (BQM), > +which is a model of variables that can be in one of two states (0 > or 1, > +or -1 or 1). BQMs are used to represent a wide range of optimization > +problems, and are particularly important in the context of quantum > +annealing and other heuristic optimization algorithms. > + > +This library provides tools to create and manipulate BQM instances, > +making it easier to work with these models in C++ applications. > Hi Yuri, Did you use any tools for this desc as it doesn't seem to match upstream's documentation? Best regards, Daniel --------------gnNRJoedLfMfg3O2fPdEk3WE Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 2025-10-11 11:52, Fernando Apesteguía wrote:


El sáb, 11 oct 2025, 11:30, Yuri Victorovich <yuri@freebsd.org> escribió:
cr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: yuri
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 6996da7c342889e15fbdc7819b830ff8de82affa
Auto-Submitted: auto-generated

Hi Yuri,

What does that auto-generated mean?



The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6996da7c342889e15fbdc7819b830ff8de82affa

commit 6996da7c342889e15fbdc7819b830ff8de82affa
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-10-11 09:29:20 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-10-11 09:30:24 +0000

    math/cimod: update 1.6.2 → 1.7.3; Make tests run; Improve pkg-descr

This commit message is a bit off I think. One thing is the commit title and other the description. Probably after the first ';' everything should be in the body of the message, IMO.

---
 math/cimod/Makefile                              |  9 +++--
 math/cimod/distinfo                              |  6 +--
 math/cimod/files/patch-external_googletest.cmake | 47 ++++++++++++++++++++++++
 math/cimod/pkg-descr                             |  9 ++++-
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/math/cimod/Makefile b/math/cimod/Makefile
index da6b482a1457..811099f57455 100644
--- a/math/cimod/Makefile
+++ b/math/cimod/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=      cimod
 DISTVERSIONPREFIX=     v
-DISTVERSION=   1.6.2
+DISTVERSION=   1.7.3
 CATEGORIES=    math

 MAINTAINER=    yuri@FreeBSD.org
 COMMENT=       C++ header-only library for a binary quadratic models
-WWW=           https://github.com/OpenJij/cimod
+WWW=           https://www.openjij.org/ \
+               https://github.com/Jij-Inc/cimod

 LICENSE=       MIT
 LICENSE_FILE=  ${WRKSRC}/LICENSE
@@ -17,7 +18,7 @@ TEST_DEPENDS= googletest>0:devel/googletest
 USES=          cmake:testing compiler:c++17-lang eigen:3,build,run

 USE_GITHUB=    yes
-GH_ACCOUNT=    OpenJij
+GH_ACCOUNT=    Jij-Inc

 CMAKE_ON=      CIMOD_INSTALL # doesn't do anything, see https://github.com/OpenJij/cimod/issues/103
 CMAKE_OFF=     CIMOD_TEST CIMOD_DOCS
@@ -28,4 +29,6 @@ NO_ARCH=      yes
 do-install: # see https://github.com/OpenJij/cimod/issues/103
        cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include

+# tests as of 1.7.3: 100% tests passed, 0 tests failed out of 79
+
 .include <bsd.port.mk>
diff --git a/math/cimod/distinfo b/math/cimod/distinfo
index e344c4bc92de..785fc5b72f5c 100644
--- a/math/cimod/distinfo
+++ b/math/cimod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709938110
-SHA256 (OpenJij-cimod-v1.6.2_GH0.tar.gz) = 732c10f68d90c9292b411c1148cf0be54b0fb812ec4aa4ba1102514486113ae1
-SIZE (OpenJij-cimod-v1.6.2_GH0.tar.gz) = 139864
+TIMESTAMP = 1760174868
+SHA256 (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = 066fe6187124da8a7ee250c060bce883828ae33f6e38a3525f72c71a6de44510
+SIZE (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = 341035
diff --git a/math/cimod/files/patch-external_googletest.cmake b/math/cimod/files/patch-external_googletest.cmake
new file mode 100644
index 000000000000..4a37cdd349ff
--- /dev/null
+++ b/math/cimod/files/patch-external_googletest.cmake
@@ -0,0 +1,47 @@
+--- external/googletest.cmake.orig     2025-01-27 12:00:00 UTC
++++ external/googletest.cmake
+@@ -14,38 +14,11 @@
+
+ include(FetchContent)
+
+-message(CHECK_START "Fetching GoogleTest")
+-list(APPEND CMAKE_MESSAGE_INDENT "  ")
+-
+-set(CMAKE_CXX_STANDARD 17)
+-set(FETCHCONTENT_QUIET OFF)
+-
+-#### Google test ####
+-FetchContent_Declare(
+-    googletest
+-    GIT_REPOSITORY  https://github.com/google/googletest
+-    GIT_TAG         v1.17.0
+-    GIT_SHALLOW     TRUE
+-)
+-
+-if(WIN32)
+-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-endif()
+-
+-# Prevent googletest from being installed by using FetchContent_Populate + add_subdirectory with EXCLUDE_FROM_ALL
+-FetchContent_GetProperties(googletest)
+-if(NOT googletest_POPULATED)
+-    FetchContent_Populate(googletest)
+-    add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+-endif()
+-
++# Try to find pre-installed GoogleTest first
+ find_package(GTest)
+
+-#FetchContent_GetProperties(googletest)
+-
+-#message(STATUS "gtest_SOURCE_DIR = ${gtest_SOURCE_DIR}")
+-#message(STATUS "gmock_SOURCE_DIR = ${gmock_SOURCE_DIR}")
+-
+-
+-list(POP_BACK CMAKE_MESSAGE_INDENT)
+-message(CHECK_PASS "fetched")
++if(NOT GTest_FOUND)
++    message(FATAL_ERROR "GoogleTest not found. Please install googletest package.")
++else()
++    message(STATUS "Found pre-installed GoogleTest")
++endif()
diff --git a/math/cimod/pkg-descr b/math/cimod/pkg-descr
index f588a9340f2f..eb48d39c4b1e 100644
--- a/math/cimod/pkg-descr
+++ b/math/cimod/pkg-descr
@@ -1 +1,8 @@
-cmod is a C++ library for a binary quadratic model.
+Cimod is a C++ header-only library for a binary quadratic model (BQM),
+which is a model of variables that can be in one of two states (0 or 1,
+or -1 or 1). BQMs are used to represent a wide range of optimization
+problems, and are particularly important in the context of quantum
+annealing and other heuristic optimization algorithms.
+
+This library provides tools to create and manipulate BQM instances,
+making it easier to work with these models in C++ applications.

Hi Yuri,

Did you use any tools for this desc as it doesn't seem to match upstream's documentation?

Best regards,
Daniel --------------gnNRJoedLfMfg3O2fPdEk3WE--