Date: Fri, 23 Feb 2024 18:53:23 +0000 From: jbo@insane.engineer To: Joel Bodenmann <jbo@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 8afc025fce05 - main - textproc/tinyxml2: Revert 450aafcba559f95c94c5f195d83b5fe4fdc3748a Message-ID: <zIpwWzw3hBWOpR9QeccBKnZ4e8aMqFmuiKOKpgasJPdgG2vfCvnzer-IPWgPiw4rIZePDOLNZQAInQUPjImiis5hJ5VeCCBHgLBNp9YOcoY=@insane.engineer> In-Reply-To: <202402231441.41NEfAkn084197@gitrepo.freebsd.org> References: <202402231441.41NEfAkn084197@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday, February 23rd, 2024 at 15:41, Joel Bodenmann <jbo@FreeBSD.org> w= rote: > The branch main has been updated by jbo: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D8afc025fce0515db8e4c6440= aa780ff9737af7ce >=20 > commit 8afc025fce0515db8e4c6440aa780ff9737af7ce > Author: Joel Bodenmann jbo@FreeBSD.org >=20 > AuthorDate: 2024-02-23 14:21:30 +0000 > Commit: Joel Bodenmann jbo@FreeBSD.org >=20 > CommitDate: 2024-02-23 14:36:43 +0000 >=20 > textproc/tinyxml2: Revert 450aafcba559f95c94c5f195d83b5fe4fdc3748a >=20 > Approved by: tcberner (portmgr) > --- > 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 | 2 +- > 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 | 27 +++++++++------------- > textproc/tinyxml2/pkg-plist | 7 ++++-- > 15 files changed, 29 insertions(+), 76 deletions(-) >=20 > diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makef= ile > index 037d37d1be2f..d628dc0b62c7 100644 > --- a/devel/ignition-common/Makefile > +++ b/devel/ignition-common/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D ignition-common > DISTVERSION=3D 3.0.0 > -PORTREVISION=3D 8 > +PORTREVISION=3D 9 > CATEGORIES=3D devel > MASTER_SITES=3D https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${B= B_COMMIT}.tar.gz?dummy=3D/ >=20 > diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile > index 1c88efd31d6a..6b3d54e6262a 100644 > --- a/games/aquaria/Makefile > +++ b/games/aquaria/Makefile > @@ -2,7 +2,7 @@ PORTNAME=3D aquaria > DISTVERSIONPREFIX=3D OSE-v > DISTVERSION=3D 1.002-22 > DISTVERSIONSUFFIX=3D -g84366ad > -PORTREVISION=3D 10 > +PORTREVISION=3D 11 > CATEGORIES=3D games >=20 > PATCH_SITES=3D https://github.com/AquariaOSE/Aquaria/commit/ > diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile > index b73849fa824f..bb825a855ed1 100644 > --- a/games/irrlamb/Makefile > +++ b/games/irrlamb/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D irrlamb > PORTVERSION=3D 1.0.3 > -PORTREVISION=3D 3 > +PORTREVISION=3D 4 > DISTVERSIONPREFIX=3D v > CATEGORIES=3D games >=20 > diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile > index 16a17e50fd3a..53b0e10b8594 100644 > --- a/games/stuntrally/Makefile > +++ b/games/stuntrally/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D stuntrally > PORTVERSION=3D 2.7 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D games >=20 > MAINTAINER=3D amdmi3@FreeBSD.org > diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile > index d398cfe85fe9..0e59cb1b850d 100644 > --- a/games/trigger-rally/Makefile > +++ b/games/trigger-rally/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D trigger-rally > PORTVERSION=3D 0.6.6.1 > -PORTREVISION=3D 5 > +PORTREVISION=3D 6 > CATEGORIES=3D games > MASTER_SITES=3D SF/trigger-rally/trigger-${PORTVERSION} >=20 > diff --git a/math/linbox/Makefile b/math/linbox/Makefile > index feb5573bb39e..00da9a75f1f7 100644 > --- a/math/linbox/Makefile > +++ b/math/linbox/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D linbox > PORTVERSION=3D 1.7.0 > DISTVERSIONPREFIX=3D v > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D math >=20 > MAINTAINER=3D thierry@FreeBSD.org > diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile > index 99e20177cc9d..0a51e00baabc 100644 > --- a/misc/dartsim/Makefile > +++ b/misc/dartsim/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D dartsim > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 6.13.0 > -PORTREVISION=3D 5 > +PORTREVISION=3D 6 > CATEGORIES=3D misc >=20 > MAINTAINER=3D yuri@FreeBSD.org > diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile > index 3452825ca889..2148d87e884e 100644 > --- a/misc/sdformat/Makefile > +++ b/misc/sdformat/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D sdformat > DISTVERSION=3D 8.0.0 > -PORTREVISION=3D 5 > +PORTREVISION=3D 6 > CATEGORIES=3D misc > MASTER_SITES=3D https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${B= B_COMMIT}.tar.gz?dummy=3D/ >=20 > diff --git a/net/ecal/Makefile b/net/ecal/Makefile > index e93839114677..9b93f43b48a0 100644 > --- a/net/ecal/Makefile > +++ b/net/ecal/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D ecal > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 5.12.1 > -PORTREVISION=3D 4 > +PORTREVISION=3D 5 > CATEGORIES=3D net devel >=20 > MAINTAINER=3D yuri@FreeBSD.org > @@ -53,7 +53,7 @@ CMAKE_ARGS=3D -DGIT_REVISION_MAJOR=3D${DISTVERSION:R:R}= \ > -Dqwt_LIBRARY=3D${LOCALBASE}/lib/qt5/libqwt.so >=20 > CXXFLAGS+=3D -pthread # see https://github.com/eclipse-ecal/ecal/issues/9= 33 > -LDFLAGS+=3D -labsl_hash -labsl_log_internal_message -labsl_log_internal_= nullguard -labsl_spinlock_wait -ltinyxml2 > +LDFLAGS+=3D -labsl_hash -labsl_log_internal_message -labsl_log_internal_= nullguard -labsl_spinlock_wait > USE_CXXSTD=3D c++17 >=20 > PLIST_SUB=3D VERSION=3D${DISTVERSION} > diff --git a/net/ecal/files/patch-CMakeLists.txt b/net/ecal/files/patch-C= MakeLists.txt > index 86a38629e154..2f925210f236 100644 > --- a/net/ecal/files/patch-CMakeLists.txt > +++ b/net/ecal/files/patch-CMakeLists.txt > @@ -1,15 +1,6 @@ > ---- CMakeLists.txt.orig 2023-10-27 08:38:06 UTC > +--- CMakeLists.txt.orig 2022-12-23 09:10:20 UTC > +++ CMakeLists.txt > -@@ -182,7 +182,7 @@ endif() > - set(possible_subprojects > - Protobuf > - spdlog > -- tinyxml2 > -+ #tinyxml2 > - fineftp > - termcolor > - recycle > -@@ -234,7 +234,7 @@ endif() > +@@ -231,7 +231,7 @@ endif() >=20 > find_package(CMakeFunctions REQUIRED) >=20 > diff --git a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.tx= t b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt > deleted file mode 100644 > index 25e820f74e07..000000000000 > --- a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt > +++ /dev/null > @@ -1,18 +0,0 @@ > ---- 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 > deleted file mode 100644 > index 67c058691f49..000000000000 > --- a/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt > +++ /dev/null > @@ -1,18 +0,0 @@ > ---- 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/Makef= ile > index 4734f5ee05ea..07147e6d2357 100644 > --- a/sysutils/fusefs-encfs/Makefile > +++ b/sysutils/fusefs-encfs/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D encfs > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 1.9.5 > -PORTREVISION=3D 7 > +PORTREVISION=3D 8 > CATEGORIES=3D sysutils > PKGNAMEPREFIX=3D fusefs- >=20 > diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile > index 1dc724e82cf4..5012b48a08a9 100644 > --- a/textproc/tinyxml2/Makefile > +++ b/textproc/tinyxml2/Makefile > @@ -1,30 +1,28 @@ > PORTNAME=3D tinyxml2 > -PORTVERSION=3D 10.0.0 > -PORTREVISION=3D 1 > +DISTVERSION=3D 10.0.0 > +PORTREVISION=3D 2 > PORTEPOCH=3D 1 > CATEGORIES=3D textproc >=20 > MAINTAINER=3D sunpoet@FreeBSD.org > COMMENT=3D Small C++ XML Parser > -WWW=3D https://leethomason.github.io/tinyxml2/ \ > - https://github.com/leethomason/tinyxml2 > +WWW=3D https://github.com/leethomason/tinyxml2 >=20 > LICENSE=3D ZLIB > LICENSE_FILE=3D ${WRKSRC}/LICENSE.txt >=20 > -USES=3D compiler:c++11-lang cpe dos2unix meson pathfix > - > -MESON_ARGS=3D --default-library=3Dboth \ > - -Ddebug=3Dfalse \ > - -Dtests=3Dtrue > +USES=3D cmake:testing compiler:c++11-lang cpe dos2unix pathfix > +CPE_VENDOR=3D tinyxml2_project > USE_LDCONFIG=3D yes >=20 > -PLIST_SUB=3D PORTVERSION=3D${PORTVERSION} > +USE_GITHUB=3D yes > +GH_ACCOUNT=3D leethomason >=20 > -GH_ACCOUNT=3D leethomason > -USE_GITHUB=3D yes > +CMAKE_TESTING_ON=3D tinyxml2_BUILD_TESTING > +PLIST_SUB=3D DISTVERSION=3D${DISTVERSION} >=20 > -CPE_VENDOR=3D tinyxml2_project > +CMAKE_OFF=3D tinyxml2_BUILD_TESTING > +CMAKE_ON=3D BUILD_SHARED_LIBS >=20 > OPTIONS_DEFINE=3D EXAMPLES >=20 > @@ -32,7 +30,4 @@ post-install-EXAMPLES-on: > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ > cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/ >=20 > -do-test: > - cd ${WRKSRC}/ && _build/xmltest > - > .include <bsd.port.mk> >=20 > diff --git a/textproc/tinyxml2/pkg-plist b/textproc/tinyxml2/pkg-plist > index d18bc5bb434e..c12561808480 100644 > --- a/textproc/tinyxml2/pkg-plist > +++ b/textproc/tinyxml2/pkg-plist > @@ -1,8 +1,11 @@ > include/tinyxml2.h > -lib/libtinyxml2.a > +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.so > lib/libtinyxml2.so.10 > -lib/libtinyxml2.so.%%PORTVERSION%% > +lib/libtinyxml2.so.%%DISTVERSION%% > libdata/pkgconfig/tinyxml2.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml Apologies for not having included a reason or the PR in the commit message.= Newbie issues... The relevant PR: 277227 Permission was given by portmgr@ here: https://lists.freebsd.org/archives/d= ev-commits-ports-all/2024-February/101285.html Best regards, ~ jbo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?zIpwWzw3hBWOpR9QeccBKnZ4e8aMqFmuiKOKpgasJPdgG2vfCvnzer-IPWgPiw4rIZePDOLNZQAInQUPjImiis5hJ5VeCCBHgLBNp9YOcoY=>