aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Bodenmann <jbo@FreeBSD.org>2024-02-23 14:21:30 +0000
committerJoel Bodenmann <jbo@FreeBSD.org>2024-02-23 14:36:43 +0000
commit8afc025fce0515db8e4c6440aa780ff9737af7ce (patch)
tree180331a0ab3ae9a76df842efa2eb37cace4ce6e0
parent882edec21f0a7c735d685f24da4ef51c90fdbe3f (diff)
downloadports-8afc025fce0515db8e4c6440aa780ff9737af7ce.tar.gz
ports-8afc025fce0515db8e4c6440aa780ff9737af7ce.zip
textproc/tinyxml2: Revert 450aafcba559f95c94c5f195d83b5fe4fdc3748a
Approved by: tcberner (portmgr)
Diffstat
-rw-r--r--devel/ignition-common/Makefile2
-rw-r--r--games/aquaria/Makefile2
-rw-r--r--games/irrlamb/Makefile2
-rw-r--r--games/stuntrally/Makefile2
-rw-r--r--games/trigger-rally/Makefile2
-rw-r--r--math/linbox/Makefile2
-rw-r--r--misc/dartsim/Makefile2
-rw-r--r--misc/sdformat/Makefile2
-rw-r--r--net/ecal/Makefile4
-rw-r--r--net/ecal/files/patch-CMakeLists.txt13
-rw-r--r--net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt18
-rw-r--r--net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt18
-rw-r--r--sysutils/fusefs-encfs/Makefile2
-rw-r--r--textproc/tinyxml2/Makefile27
-rw-r--r--textproc/tinyxml2/pkg-plist7
15 files changed, 29 insertions, 76 deletions
diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makefile
index 037d37d1be2f..d628dc0b62c7 100644
--- a/devel/ignition-common/Makefile
+++ b/devel/ignition-common/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ignition-common
DISTVERSION= 3.0.0
-PORTREVISION= 8
+PORTREVISION= 9
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 1c88efd31d6a..6b3d54e6262a 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= 10
+PORTREVISION= 11
CATEGORIES= games
PATCH_SITES= 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= irrlamb
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= games
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= stuntrally
PORTVERSION= 2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MAINTAINER= 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= trigger-rally
PORTVERSION= 0.6.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/trigger-rally/trigger-${PORTVERSION}
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= linbox
PORTVERSION= 1.7.0
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MAINTAINER= 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= dartsim
DISTVERSIONPREFIX= v
DISTVERSION= 6.13.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc
MAINTAINER= 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= sdformat
DISTVERSION= 8.0.0
-PORTREVISION= 5
+PORTREVISION= 6
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 e93839114677..9b93f43b48a0 100644
--- a/net/ecal/Makefile
+++ b/net/ecal/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ecal
DISTVERSIONPREFIX= v
DISTVERSION= 5.12.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net devel
MAINTAINER= yuri@FreeBSD.org
@@ -53,7 +53,7 @@ CMAKE_ARGS= -DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \
-Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt.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 -ltinyxml2
+LDFLAGS+= -labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait
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 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()
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
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/Makefile
index 4734f5ee05ea..07147e6d2357 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= encfs
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-
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= tinyxml2
-PORTVERSION= 10.0.0
-PORTREVISION= 1
+DISTVERSION= 10.0.0
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= textproc
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Small C++ XML Parser
-WWW= https://leethomason.github.io/tinyxml2/ \
- https://github.com/leethomason/tinyxml2
+WWW= https://github.com/leethomason/tinyxml2
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= compiler:c++11-lang cpe dos2unix meson pathfix
-
-MESON_ARGS= --default-library=both \
- -Ddebug=false \
- -Dtests=true
+USES= cmake:testing compiler:c++11-lang cpe dos2unix pathfix
+CPE_VENDOR= tinyxml2_project
USE_LDCONFIG= yes
-PLIST_SUB= PORTVERSION=${PORTVERSION}
+USE_GITHUB= yes
+GH_ACCOUNT= leethomason
-GH_ACCOUNT= leethomason
-USE_GITHUB= yes
+CMAKE_TESTING_ON= tinyxml2_BUILD_TESTING
+PLIST_SUB= DISTVERSION=${DISTVERSION}
-CPE_VENDOR= tinyxml2_project
+CMAKE_OFF= tinyxml2_BUILD_TESTING
+CMAKE_ON= BUILD_SHARED_LIBS
OPTIONS_DEFINE= EXAMPLES
@@ -32,7 +30,4 @@ post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/
-do-test:
- cd ${WRKSRC}/ && _build/xmltest
-
.include <bsd.port.mk>
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 03:42:19 +0000