From nobody Wed Feb 21 15:20:08 2024 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 4Tg0MF2SFBz59fWd; Wed, 21 Feb 2024 15:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg0MF0lPMz42Bs; Wed, 21 Feb 2024 15:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdirdcJ1oUmFc/9Gni/2uZ5vniUVETt5I2ggEZSiRCM=; b=dRMlzIrkOA2Q/O5SBajkDX+4Pb3LTlYfhcGmoUd6kuNvl9JtwIkyDfjjiPlquPUeNoAvtu sCg0QSDFPUJvx/Yc/ByBwRvozqOuuNC+X3csR22kOvlN2wtTMoVr4KCRHOfGTXTsv1wF9I 7T1MG6SsyI7kuP5Tbvwx0bQzfZFT7nZxZvQoBedfmR/aiP1hv9aVzXOXu0fxVjOgZgbsy4 1VQoQdUr+LdfBvw9sHjq7Ek+K5TAQ9tnwIoMlzEy12/lz3gw/G5lwQaLYALy74w3TqGN0f 8e8dgXsJVguRda/6Xu5K3iSK8dDSja9d6KLcZju60esmSjxtt8YHnNFElUcGDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdirdcJ1oUmFc/9Gni/2uZ5vniUVETt5I2ggEZSiRCM=; b=vk+WcH3sAoNdeOKhoMB6JHaksPLmIVzDr+Yq6d94LFUkafH+M/UsUK5wUXZ6kdWwxih2fe haljByGpjUkq3QbnOEK8GdaA9ktMvxlracbPawoJl3Jw/87dzACuisq6luPN5MAy3IpV57 DyCXvfKzwWFm4/vltTNYp0tD/MG1ZIUqEGjooacyPpD8d/hbvsnZNMcPRst8jmtCczgjjq nbPAHg9VRAVltDG7xKYewFITybTvUgohGMEyM8DrsmFlr4J7fOUC/xL0SKAELrWG+EV4nD dRRWy4pIpu1XfxnblLMW3rfzQzY7W6xOT9G5yAnTj3P1zhYy/Z7+Ua8RzZ/2hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708528809; a=rsa-sha256; cv=none; b=uVZBx0TVSXpGpT6qNgnUmvnsLzOwOOclvKSJo8ZzNiRo60wU9tQ7KziAGsAwBRQk+N1rbj GeiJghd2CpP91/ytk/fg+tisbSHtvVKh86F4YTAfdrNMaKKT242oV6HthqCG5kZlo0kWo8 69hl/+rLukOqsW07teoukBZ6i2YruAOrLqe83TWGqZeDeB6VKDY9rT/OVfTo2U0e21y9pm 1pq5uOIfKQwTlXw1agvJ06Kqg5efgOF/LCFrTdUihEcC1SJJgzIcGMED8JbXrDvR4l25tS f5AjKmtNKBwf6ccha3oMg8wtai/MZiVSzNUWIDJcnt8VrH0h4MtiPLugzaI7CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tg0MD6sKRz172Q; Wed, 21 Feb 2024 15:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFK8K5022413; Wed, 21 Feb 2024 15:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFK8mS022399; Wed, 21 Feb 2024 15:20:08 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:20:08 GMT Message-Id: <202402211520.41LFK8mS022399@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 450aafcba559 - main - textproc/tinyxml2: Update to 10.0.0 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 450aafcba559f95c94c5f195d83b5fe4fdc3748a Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=450aafcba559f95c94c5f195d83b5fe4fdc3748a commit 450aafcba559f95c94c5f195d83b5fe4fdc3748a Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 14:29:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:06:47 +0000 textproc/tinyxml2: Update to 10.0.0 - Convert to meson - Fix 0c022f0fc854184d95ff3303049a063a39b1f551 - Bump PORTREVISION for package change - Bump PORTREVISION of dependent ports for shlib change - Remove duplicate PORTREVISION from math/linbox Changes: https://github.com/leethomason/tinyxml2/releases https://github.com/leethomason/tinyxml2/commits/master --- devel/ignition-common/Makefile | 2 +- games/aquaria/Makefile | 2 +- games/irrlamb/Makefile | 2 +- games/stuntrally/Makefile | 2 +- games/trigger-rally/Makefile | 2 +- math/linbox/Makefile | 3 +-- misc/dartsim/Makefile | 2 +- misc/sdformat/Makefile | 2 +- net/ecal/Makefile | 4 ++-- net/ecal/files/patch-CMakeLists.txt | 13 +++++++++-- .../patch-app_rec_rec__server__core_CMakeLists.txt | 18 +++++++++++++++ .../files/patch-app_sys_sys__core_CMakeLists.txt | 18 +++++++++++++++ sysutils/fusefs-encfs/Makefile | 2 +- textproc/tinyxml2/Makefile | 26 +++++++++++++--------- textproc/tinyxml2/pkg-plist | 7 ++---- 15 files changed, 76 insertions(+), 29 deletions(-) diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makefile index c72ad19d551d..037d37d1be2f 100644 --- a/devel/ignition-common/Makefile +++ b/devel/ignition-common/Makefile @@ -1,6 +1,6 @@ PORTNAME= ignition-common DISTVERSION= 3.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile index 0190b93653c5..1c88efd31d6a 100644 --- a/games/aquaria/Makefile +++ b/games/aquaria/Makefile @@ -2,7 +2,7 @@ PORTNAME= aquaria DISTVERSIONPREFIX= OSE-v DISTVERSION= 1.002-22 DISTVERSIONSUFFIX= -g84366ad -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games PATCH_SITES= https://github.com/AquariaOSE/Aquaria/commit/ diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index f7af030fc0fc..b73849fa824f 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -1,6 +1,6 @@ PORTNAME= irrlamb PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= games diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile index be93e34acbc1..16a17e50fd3a 100644 --- a/games/stuntrally/Makefile +++ b/games/stuntrally/Makefile @@ -1,6 +1,6 @@ PORTNAME= stuntrally PORTVERSION= 2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile index ff6d08904240..d398cfe85fe9 100644 --- a/games/trigger-rally/Makefile +++ b/games/trigger-rally/Makefile @@ -1,6 +1,6 @@ PORTNAME= trigger-rally PORTVERSION= 0.6.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/trigger-rally/trigger-${PORTVERSION} diff --git a/math/linbox/Makefile b/math/linbox/Makefile index e1c1f52f8fd2..feb5573bb39e 100644 --- a/math/linbox/Makefile +++ b/math/linbox/Makefile @@ -1,8 +1,7 @@ PORTNAME= linbox PORTVERSION= 1.7.0 -PORTREVISION= 1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= thierry@FreeBSD.org diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index cb519fbc0c7e..99e20177cc9d 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,7 +1,7 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.13.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile index 055c562630b8..3452825ca889 100644 --- a/misc/sdformat/Makefile +++ b/misc/sdformat/Makefile @@ -1,6 +1,6 @@ PORTNAME= sdformat DISTVERSION= 8.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ diff --git a/net/ecal/Makefile b/net/ecal/Makefile index 7fc5223617ab..b984fdfc6696 100644 --- a/net/ecal/Makefile +++ b/net/ecal/Makefile @@ -1,7 +1,7 @@ PORTNAME= ecal DISTVERSIONPREFIX= v DISTVERSION= 5.12.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net devel MAINTAINER= yuri@FreeBSD.org @@ -53,7 +53,7 @@ CMAKE_ARGS= -DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \ -Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so CXXFLAGS+= -pthread # see https://github.com/eclipse-ecal/ecal/issues/933 -LDFLAGS+= -labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait +LDFLAGS+= -labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait -ltinyxml2 USE_CXXSTD= c++17 PLIST_SUB= VERSION=${DISTVERSION} diff --git a/net/ecal/files/patch-CMakeLists.txt b/net/ecal/files/patch-CMakeLists.txt index 2f925210f236..86a38629e154 100644 --- a/net/ecal/files/patch-CMakeLists.txt +++ b/net/ecal/files/patch-CMakeLists.txt @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2022-12-23 09:10:20 UTC +--- CMakeLists.txt.orig 2023-10-27 08:38:06 UTC +++ CMakeLists.txt -@@ -231,7 +231,7 @@ endif() +@@ -182,7 +182,7 @@ endif() + set(possible_subprojects + Protobuf + spdlog +- tinyxml2 ++ #tinyxml2 + fineftp + termcolor + recycle +@@ -234,7 +234,7 @@ endif() find_package(CMakeFunctions REQUIRED) diff --git a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt new file mode 100644 index 000000000000..25e820f74e07 --- /dev/null +++ b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt @@ -0,0 +1,18 @@ +--- app/rec/rec_server_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC ++++ app/rec/rec_server_core/CMakeLists.txt +@@ -20,7 +20,6 @@ find_package(Threads REQUIRED) + find_package(Protobuf REQUIRED) + find_package(spdlog REQUIRED) + find_package(fineftp REQUIRED) +-find_package(tinyxml2 REQUIRED) + + set(PROJECT_NAME rec_server_core) + +@@ -66,7 +65,6 @@ create_targets_protobuf() + + target_link_libraries(${PROJECT_NAME} + PRIVATE +- tinyxml2::tinyxml2 + protobuf::libprotobuf + eCAL::core + eCAL::app_pb diff --git a/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt b/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt new file mode 100644 index 000000000000..67c058691f49 --- /dev/null +++ b/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt @@ -0,0 +1,18 @@ +--- app/sys/sys_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC ++++ app/sys/sys_core/CMakeLists.txt +@@ -21,7 +21,6 @@ project(sys_core) + find_package(Threads REQUIRED) + find_package(Protobuf REQUIRED) + find_package(spdlog REQUIRED) +-find_package(tinyxml2 REQUIRED) + + set(ecalsyscore_src + include/ecalsys/ecal_sys.h +@@ -88,7 +87,6 @@ create_targets_protobuf() + + target_link_libraries(${PROJECT_NAME} + Threads::Threads +- tinyxml2::tinyxml2 + spdlog::spdlog + protobuf::libprotobuf + eCAL::core diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile index 533886cd24a9..4734f5ee05ea 100644 --- a/sysutils/fusefs-encfs/Makefile +++ b/sysutils/fusefs-encfs/Makefile @@ -1,7 +1,7 @@ PORTNAME= encfs DISTVERSIONPREFIX= v DISTVERSION= 1.9.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile index c465308fda25..1dc724e82cf4 100644 --- a/textproc/tinyxml2/Makefile +++ b/textproc/tinyxml2/Makefile @@ -1,27 +1,30 @@ PORTNAME= tinyxml2 -DISTVERSION= 10.0.0 +PORTVERSION= 10.0.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc MAINTAINER= sunpoet@FreeBSD.org COMMENT= Small C++ XML Parser -WWW= https://github.com/leethomason/tinyxml2 +WWW= https://leethomason.github.io/tinyxml2/ \ + https://github.com/leethomason/tinyxml2 LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake:testing compiler:c++11-lang cpe dos2unix pathfix -CPE_VENDOR= tinyxml2_project +USES= compiler:c++11-lang cpe dos2unix meson pathfix + +MESON_ARGS= --default-library=both \ + -Ddebug=false \ + -Dtests=true USE_LDCONFIG= yes -USE_GITHUB= yes -GH_ACCOUNT= leethomason +PLIST_SUB= PORTVERSION=${PORTVERSION} -CMAKE_TESTING_ON= tinyxml2_BUILD_TESTING -PLIST_SUB= DISTVERSION=${DISTVERSION} +GH_ACCOUNT= leethomason +USE_GITHUB= yes -CMAKE_OFF= tinyxml2_BUILD_TESTING -CMAKE_ON= BUILD_SHARED_LIBS +CPE_VENDOR= tinyxml2_project OPTIONS_DEFINE= EXAMPLES @@ -29,4 +32,7 @@ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/ +do-test: + cd ${WRKSRC}/ && _build/xmltest + .include diff --git a/textproc/tinyxml2/pkg-plist b/textproc/tinyxml2/pkg-plist index c12561808480..d18bc5bb434e 100644 --- a/textproc/tinyxml2/pkg-plist +++ b/textproc/tinyxml2/pkg-plist @@ -1,11 +1,8 @@ include/tinyxml2.h -lib/cmake/tinyxml2/tinyxml2-config-version.cmake -lib/cmake/tinyxml2/tinyxml2-config.cmake -lib/cmake/tinyxml2/tinyxml2-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/tinyxml2/tinyxml2-shared-targets.cmake +lib/libtinyxml2.a lib/libtinyxml2.so lib/libtinyxml2.so.10 -lib/libtinyxml2.so.%%DISTVERSION%% +lib/libtinyxml2.so.%%PORTVERSION%% libdata/pkgconfig/tinyxml2.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml