devel/protobuf: Update to 24.4

- Use USES=pathfix to fix .pc installation - Bump PORTREVISION of dependent ports for shlib change Changes: https://github.com/protocolbuffers/protobuf/releases
freebsd · Dec 14, 2023 · 69e2e87 · 69e2e87
1 parent 51be0fc
commit 69e2e87
Show file tree

Hide file tree

Showing 72 changed files with 234 additions and 248 deletions.
diff --git a/astro/kosmindoormap/Makefile b/astro/kosmindoormap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kosmindoormap
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libosmpbf
 PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3@FreeBSD.org

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info

diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mixxx
 DISTVERSION=	2.3.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 
 MAINTAINER=	acm@FreeBSD.org

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mumble
 DISTVERSION=	1.5.517
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/
 

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	murmur
 PORTVERSION=	1.3.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio net
 
 MAINTAINER=	ports@FreeBSD.org

diff --git a/audio/py-torchaudio/Makefile b/audio/py-torchaudio/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	torchaudio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	audio python # machine-learning
 MASTER_SITES=	https://downloads.sourceforge.net/project/sox/sox/14.4.2/:sox
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	strawberry
 DISTVERSION=	1.0.22
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \
 		https://files.jkvinge.net/packages/strawberry/

diff --git a/cad/cura-engine/Makefile b/cad/cura-engine/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		CuraEngine
 PORTEPOCH=		1
 DISTVERSION=		4.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		cad
 DIST_SUBDIR=		Ultimaker
 

diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arrow
 DISTVERSION=	13.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mysql-connector-c++
 PORTVERSION=	8.0.33
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-C++
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	mysql
 PORTVERSION=	5.7.44
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server

diff --git a/databases/xtrabackup8/Makefile b/databases/xtrabackup8/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xtrabackup
 PORTVERSION=	8.0.31
 DISTVERSIONSUFFIX=	-24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/percona/percona-xtrabackup/archive/:percona \
 		SF/boost/boost/${BOOST_VERSION}:boost

diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel
 MASTER_SITES=	GH
 

diff --git a/devel/bear/Makefile b/devel/bear/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bear
 DISTVERSION=	3.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	jrm@FreeBSD.org

diff --git a/devel/bloaty/Makefile b/devel/bloaty/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bloaty
 PORTVERSION=	1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org

diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grpc
 PORTVERSION=	1.54.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	devel
 

diff --git a/devel/grpc142/Makefile b/devel/grpc142/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grpc
 PORTVERSION=	1.42.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 PKGNAMESUFFIX=	142
 

diff --git a/devel/ignition-msgs/Makefile b/devel/ignition-msgs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ignition-msgs
 DISTVERSION=	3.0.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 

diff --git a/devel/kpublictransport/Makefile b/devel/kpublictransport/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kpublictransport
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	libphonenumber
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.13.26
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org

diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	protobuf-c
 DISTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 

diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	protobuf
-PORTVERSION=	3.21.12
-DISTVERSIONPREFIX=	cpp-
+PORTVERSION=	24.4
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION:R:E}.${PORTVERSION:E}/
+MASTER_SITES=	https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Data interchange format library
@@ -15,26 +14,38 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_sparc64=	fails to compile: no atomic ops available
 
+LIB_DEPENDS=	libabsl_base.so:devel/abseil \
+		libjsoncpp.so:devel/jsoncpp
 TEST_DEPENDS=	googletest>=0:devel/googletest
 
-USES=		compiler:c++11-lang cpe libtool localbase pathfix pkgconfig
-
-CFLAGS+=	-D_THREAD_SAFE -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
-CONFIGURE_ENV=	CC_FOR_BUILD="${CC}" \
-		CFLAGS_FOR_BUILD="${CFLAGS}" \
-		CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \
-		CXX_FOR_BUILD="${CXX}" \
-		CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
-		LDFLAGS_FOR_BUILD="${LDFLAGS}"
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-TEST_ARGS=	${MAKE_ARGS} ${_MAKE_JOBS}
-TEST_TARGET=	check
-USE_CXXSTD=	c++11
+USES=		cmake:testing compiler:c++17-lang cpe localbase pathfix pkgconfig
+
+CMAKE_ARGS=	-Dprotobuf_ABSL_PROVIDER=package \
+		-Dprotobuf_JSONCPP_PROVIDER=package
+CMAKE_OFF=	protobuf_BUILD_CONFORMANCE \
+		protobuf_BUILD_EXAMPLES \
+		protobuf_BUILD_EXAMPLES_MULTITEST \
+		protobuf_BUILD_TESTS \
+		protobuf_DISABLE_RTTI \
+		protobuf_INSTALL_EXAMPLES \
+		protobuf_MODULE_COMPATIBLE \
+		protobuf_REMOVE_INSTALLED_HEADERS
+CMAKE_ON=	protobuf_ABSOLUTE_TEST_PLUGIN_PATH \
+		protobuf_ALLOW_CCACHE \
+		protobuf_BUILD_LIBPROTOC \
+		protobuf_BUILD_PROTOBUF_BINARIES \
+		protobuf_BUILD_PROTOC_BINARIES \
+		protobuf_BUILD_SHARED_LIBS \
+		protobuf_INSTALL \
+		protobuf_USE_EXTERNAL_GTEST \
+		protobuf_VERBOSE \
+		protobuf_WITH_ZLIB
+CMAKE_TESTING_ON=	protobuf_BUILD_TESTS
+PATHFIX_CMAKELISTSTXT=	CMakeLists.txt install.cmake
+USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	PATCH_VERSION=${PORTVERSION:E}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 CPE_VENDOR=	google
 

diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589582
-SHA256 (protobuf-cpp-3.21.12.tar.gz) = 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460
-SIZE (protobuf-cpp-3.21.12.tar.gz) = 4842303
+TIMESTAMP = 1696454861
+SHA256 (protobuf-24.4.tar.gz) = 616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8
+SIZE (protobuf-24.4.tar.gz) = 5180235
diff --git a/devel/protobuf/files/patch-Makefile.in b/devel/protobuf/files/patch-Makefile.in
diff --git a/devel/protobuf/files/patch-i386 b/devel/protobuf/files/patch-i386