Skip to content

Commit 484d2be

Browse files
suhailskhansuhailskhan
committed
ports: use protobuf and/or py-protobuf
1 parent 8333356 commit 484d2be

File tree

68 files changed

+156
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+156
-151
lines changed

‎R/R-RProtoBuf/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PortSystem 1.0
44
PortGroup R 1.0
55

66
R.setup cran eddelbuettel RProtoBuf 0.4.22
7-
revision 1
7+
revision 2
88
categories-append devel
99
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
1010
license GPL-2+
@@ -23,7 +23,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 16} {
2323

2424
depends_build-append \
2525
port:pkgconfig
26-
depends_lib-append port:protobuf3-cpp \
26+
depends_lib-append port:protobuf \
2727
port:R-Rcpp
2828

2929
compiler.cxx_standard 2017

‎R/R-cld3/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PortGroup R 1.0
55

66
# GitHub version is old.
77
R.setup cran ropensci cld3 1.6.1
8-
revision 0
8+
revision 1
99
categories-append devel
1010
maintainers nomaintainer
1111
license Apache-2
@@ -19,7 +19,7 @@ checksums rmd160 60afb8f5c37a0ecf1d418977c0226d74f4bd4e3c \
1919
depends_build-append \
2020
path:bin/pkg-config:pkgconfig
2121

22-
depends_lib-append port:protobuf3-cpp \
22+
depends_lib-append port:protobuf \
2323
port:R-Rcpp
2424

2525
if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {

‎R/R-protolite/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PortGroup R 1.0
55

66
# GitHub version lags behind.
77
R.setup cran jeroen protolite 2.3.1
8-
revision 0
8+
revision 1
99
categories-append devel
1010
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
1111
license MIT
@@ -27,7 +27,7 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
2727
depends_build-append \
2828
path:bin/pkg-config:pkgconfig
2929

30-
depends_lib-append port:protobuf3-cpp \
30+
depends_lib-append port:protobuf \
3131
port:R-jsonlite \
3232
port:R-Rcpp
3333

‎aqua/qt513/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,12 +592,12 @@ array set modules {
592592
255593964
593593
}
594594
"port:python27 port:py27-ply path:bin/ninja:ninja port:gperf port:bison port:flex"
595-
"port:fontconfig port:dbus path:lib/pkgconfig/harfbuzz.pc:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 port:jsoncpp port:protobuf3-cpp path:lib/pkgconfig/poppler.pc:poppler port:pulseaudio path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
595+
"port:fontconfig port:dbus path:lib/pkgconfig/harfbuzz.pc:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 port:jsoncpp port:protobuf path:lib/pkgconfig/poppler.pc:poppler port:pulseaudio path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
596596
"qtdeclarative qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools"
597597
{"Qt WebEngine"}
598598
"very large and relatively new"
599599
"variant overrides: "
600-
"revision 11"
600+
"revision 12"
601601
"License: "
602602
}
603603
qtwebglplugin {

‎databases/mysql57/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if {$subport eq $name} {
4343
# poll-emulator breaks the build, if active:
4444
# xcom/task.c:744:37: error: 'POLLRDNORM' undeclared (first use in this function)
4545
# See also: https://trac.macports.org/ticket/38558
46-
conflicts_build boost protobuf3-cpp protobuf-cpp poll-emulator
46+
conflicts_build boost protobuf protobuf3-cpp protobuf2-cpp poll-emulator
4747

4848
distfiles ${distname}${extract.suffix}:mysql \
4949
${boost_distname}${extract.suffix}:boost

‎databases/mysql8/Portfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ maintainers {gmail.com:herby.gillot @herbygillot} \
1313
openmaintainer
1414

1515
# Set revision_client and revision_server to 0 on version bump.
16-
set revision_client 1
17-
set revision_server 0
16+
set revision_client 2
17+
set revision_server 1
1818

1919
set name_mysql ${name}
2020
set version_branch [join [lrange [split ${version} .] 0 1] .]
@@ -67,7 +67,7 @@ if {$subport eq $name} {
6767
port:libfido2 \
6868
port:libevent \
6969
port:openldap \
70-
port:protobuf3-cpp \
70+
port:protobuf \
7171
port:zlib \
7272
port:zstd
7373

‎databases/percona/Portfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ set name_package ${name}-server
88
set version_mysql 8.0.16
99
set release 7
1010
# Please set revision_client and revision_server to 0 if you bump version_mysql or release.
11-
set revision_client 9
12-
set revision_server 2
11+
set revision_client 10
12+
set revision_server 3
1313
set boost_version 1.69.0
1414
version ${version_mysql}-${release}
1515
categories databases
@@ -64,7 +64,7 @@ if {$subport eq $name} {
6464
path:lib/pkgconfig/icu-uc.pc:icu \
6565
port:libevent \
6666
port:lz4 \
67-
port:protobuf3-cpp \
67+
port:protobuf \
6868
port:re2 \
6969
port:zlib \
7070
port:tcp_wrappers

‎devel/Bear/Portfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ legacysupport.use_mp_libcxx yes
1111

1212
github.setup rizsotto Bear 3.1.6
1313
github.tarball_from archive
14-
revision 0
14+
revision 1
1515

1616
checksums rmd160 41ff322cdbc0c5f15adf17193b586c3dad441230 \
1717
sha256 99cd891eec6e89b734d7cafe0e623dd8c2f27d8cbf3ee9bc4807e69e5c8fb55c \
@@ -46,8 +46,9 @@ depends_build-append \
4646
depends_lib-append port:abseil \
4747
port:grpc \
4848
port:${port_libfmt} \
49-
port:protobuf3-cpp
49+
port:protobuf
5050

5151
configure.args-append \
5252
-DENABLE_UNIT_TESTS=Off \
5353
-DENABLE_FUNC_TESTS=Off
54+
-DCMAKE_EXE_LINKER_FLAGS="-lgrpc -lgpr"

‎devel/apache-arrow/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if {${subport} eq ${name}} {
3636
PortGroup github 1.0
3737

3838
github.setup apache arrow ${version} ${name}-
39-
revision 0
39+
revision 1
4040

4141
checksums rmd160 fff854f94a1fbd1df4621b5d01d7db795ab8c5fb \
4242
sha256 67e31a4f46528634b8c3cbb0dc60ac8f85859d906b400d83d0b6f732b0c5b0e3 \
@@ -87,7 +87,7 @@ if {${subport} eq ${name}} {
8787
port:libutf8proc \
8888
port:lz4 \
8989
port:ninja \
90-
port:protobuf3-cpp \
90+
port:protobuf \
9191
path:lib/pkgconfig/RapidJSON.pc:rapidjson \
9292
port:re2 \
9393
port:snappy \

‎devel/grpc/Portfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ depends_lib-append \
4949
port:lbzip2 \
5050
path:lib/pkgconfig/libuv.pc:libuv \
5151
path:lib/libssl.dylib:openssl \
52-
port:protobuf3-cpp \
52+
port:protobuf \
5353
port:re2 \
5454
port:zlib
5555

@@ -256,7 +256,7 @@ if {[string match "py*${name_io}" ${subport}]} {
256256

257257
depends_lib-append \
258258
port:py${python.version}-cython \
259-
port:py${python.version}-protobuf3 \
259+
port:py${python.version}-protobuf \
260260
port:py${python.version}-six
261261

262262
depends_test-append \
@@ -287,7 +287,7 @@ if {[string match "py*-${name_io}-tools" ${subport}]} {
287287

288288
depends_lib-append \
289289
port:py${python.version}-${name_io} \
290-
port:py${python.version}-protobuf3
290+
port:py${python.version}-protobuf
291291

292292
# Build instructions:
293293
# https://github.com/grpc/grpc/tree/master/tools/distrib/python/grpcio_tools

‎devel/libphonenumber-cpp/Portfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ boost.version 1.81
1111
github.setup googlei18n libphonenumber 8.13.49 v
1212
# Change github.tarball_from to 'releases' or 'archive' next update
1313
github.tarball_from tarball
14-
revision 1
14+
revision 2
1515
name libphonenumber-cpp
1616
license Apache-2
1717
description Google's C++ library for parsing, formatting, storing \
@@ -34,7 +34,7 @@ depends_build-append \
3434

3535
depends_lib-append port:abseil \
3636
path:lib/pkgconfig/icu-uc.pc:icu \
37-
port:protobuf3-cpp
37+
port:protobuf
3838

3939
configure.args-append \
4040
-DABSL_PROPAGATE_CXX_STD=ON \
@@ -47,7 +47,7 @@ configure.args-append \
4747
compiler.cxx_standard 2017
4848
configure.cxxflags-append -std=c++17
4949

50-
# force protobuf3-cpp into the no_threadlocal mode on older systems
50+
# force protobuf into the no_threadlocal mode on older systems
5151
if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
5252
configure.cppflags-append \
5353
-DGOOGLE_PROTOBUF_NO_THREADLOCAL

‎devel/protobuf-c/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ depends_build-append \
3232
port:pkgconfig
3333

3434
depends_lib-append \
35-
port:protobuf3-cpp
35+
port:protobuf
3636

3737
compiler.cxx_standard 2014
3838

‎devel/protobuf/Portfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ PortGroup legacysupport 1.1
1010
# https://github.com/macports/macports-ports/pull/19905#issuecomment-1680281240
1111
legacysupport.newest_darwin_requires_legacy 15
1212

13+
# NOTE: For a minor or major version number change, also
14+
# NOTE: Revbump et, protobuf-c, mosh and py-onnx
15+
1316
name protobuf
1417
github.setup protocolbuffers protobuf 30.2 v
1518
github.tarball_from releases

‎devel/protobuf3-cpp/Portfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ PortGroup github 1.0
77

88
# NOTE: For any version number change, also
99
# NOTE: Update py-protobuf3 version's number to match
10-
# NOTE: For a minor or major version number change, also
11-
# NOTE: Revbump et, protobuf-c, mosh and py-onnx
1210
set release_version \
1311
21.12
1412

‎devel/protozero/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PortGroup github 1.0
66

77
github.setup mapbox protozero 1.7.1 v
88
github.tarball_from archive
9-
revision 2
9+
revision 3
1010

1111
categories devel
1212
platforms any
@@ -41,6 +41,6 @@ configure.args-append \
4141
variant protobuf description {Use protobuf library to include writer unit test} {
4242

4343
depends_build-append \
44-
port:protobuf3-cpp
44+
port:protobuf
4545

4646
}

‎finance/litecoin/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PortGroup boost 1.0
88
github.setup litecoin-project litecoin 0.16.3 v
99
# Change github.tarball_from to 'releases' or 'archive' next update
1010
github.tarball_from tarball
11-
revision 11
11+
revision 12
1212
checksums rmd160 aa2470a9e4f32c62953c5aae460471e0e3f1f801 \
1313
sha256 0dccc577d704bd48226d11b749cca3bd7cadd23694ccbb15a87a0806704a69c3 \
1414
size 6045235
@@ -45,7 +45,7 @@ depends_lib-append path:lib/libssl.dylib:openssl \
4545
port:db48 \
4646
port:libevent \
4747
port:miniupnpc \
48-
port:protobuf3-cpp \
48+
port:protobuf \
4949
port:qrencode \
5050
port:zmq
5151

‎games/Cockatrice/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ github.setup Cockatrice Cockatrice 2016-05-06-Release
1212
github.tarball_from tarball
1313

1414
epoch 1
15-
revision 7
15+
revision 8
1616
categories games
1717
maintainers nomaintainer
1818
description A board for playing trading card games like MTG online
@@ -25,7 +25,7 @@ homepage http://www.woogerworks.com/
2525
checksums rmd160 f590177c0e2252e9905c8c5bd7d50d070348b916 \
2626
sha256 03751fd5283bfa0cd38071c2de295093dcace9c6ef9ad2a5ca3eba6d95e45cf9
2727

28-
depends_lib-append port:protobuf3-cpp
28+
depends_lib-append port:protobuf
2929

3030
configure.args-append -DWITH_QT4:BOOL=ON
3131

‎games/raceintospace/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PortGroup compiler_blacklist_versions 1.0
88

99
github.setup raceintospace raceintospace d004825458d9892fb168a9fbe026a9a38d397b04
1010
version 1.1-20200802
11-
revision 4
11+
revision 5
1212
checksums rmd160 74767ef94b588f672c6c7eb4c0e78f4d46a2ea65 \
1313
sha256 826fd4ec937aceb42f2942f6645661657fadd68f791d6f99de0d47789bd1b763 \
1414
size 63707066
@@ -34,7 +34,7 @@ depends_lib-append port:jsoncpp \
3434
port:libtheora \
3535
port:libvorbis \
3636
port:physfs \
37-
port:protobuf3-cpp \
37+
port:protobuf \
3838
port:zlib
3939

4040
# jsoncpp requires C++11

‎gis/qgis3/Portfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if {${subport} eq ${name}} {
2727
# Latest version
2828
github.setup qgis QGIS 3_42_2 final-
2929
github.tarball_from archive
30-
revision 1
30+
revision 2
3131
set app_name QGIS3
3232

3333
checksums rmd160 15591b7b2ea1bf360141bbbb5ec394f176f22b54 \
@@ -37,7 +37,7 @@ if {${subport} eq ${name}} {
3737
# LTR version
3838
github.setup qgis QGIS 3_40_6 final-
3939
github.tarball_from archive
40-
revision 1
40+
revision 2
4141
set app_name QGIS3-LTR
4242
description {*}${description} (LTR)
4343

@@ -88,7 +88,7 @@ depends_lib-append port:draco \
8888
port:libzip \
8989
port:pdal \
9090
port:proj \
91-
port:protobuf3-cpp \
91+
port:protobuf \
9292
port:qca-qt5 \
9393
port:qca-qt5-ossl \
9494
port:qjson-qt5 \
@@ -259,7 +259,7 @@ foreach pyver ${python_suffixes} {
259259
port:py${pyver}-pyqt5-scintilla \
260260
port:py${pyver}-gdal \
261261
port:py${pyver}-six \
262-
port:py${pyver}-protobuf3
262+
port:py${pyver}-protobuf
263263
264264
depends_build-append port:py${pyver}-pyqt-builder \
265265
path:${frameworks_dir}/Python.framework/Versions/${pyversion}/bin/sip-build:py${pyver}-sip

‎gis/tilemaker/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PortGroup boost 1.0
88
github.setup systemed tilemaker 3.0.0 v
99
# Change github.tarball_from to 'releases' or 'archive' next update
1010
github.tarball_from tarball
11-
revision 1
11+
revision 2
1212

1313
categories gis
1414
license FTWPL
@@ -28,7 +28,7 @@ depends_build-append \
2828

2929
depends_lib-append \
3030
port:lua \
31-
port:protobuf3-cpp \
31+
port:protobuf \
3232
port:rapidjson \
3333
port:shapelib \
3434
port:sqlite3 \

‎gnome/Chatty/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ depends_lib-append port:abseil \
6060
depends_run-append port:gsettings-desktop-schemas \
6161
port:libsecret
6262

63-
# protobuf3-cpp used by libphonenumber-cpp needs at least C++11,
63+
# protobuf used by libphonenumber-cpp needs at least C++11,
6464
# also: https://gitlab.gnome.org/World/Chatty/-/issues/951
6565
compiler.cxx_standard 2017
6666
compiler.blacklist-append \

‎graphics/QtPBFImagePlugin/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PortGroup qmake5 1.0
77
github.setup tumic0 QtPBFImagePlugin 3.0
88
# Change github.tarball_from to 'releases' or 'archive' next update
99
github.tarball_from tarball
10-
revision 0
10+
revision 1
1111
categories graphics
1212
license LGPL-3
1313
maintainers {@sikmir disroot.org:sikmir} openmaintainer
@@ -25,7 +25,7 @@ patchfiles-append patch-protobuf-dylib.diff
2525
configure.args-append \
2626
PROTOBUF=${prefix} ZLIB=${prefix}
2727

28-
depends_lib-append port:protobuf3-cpp \
28+
depends_lib-append port:protobuf \
2929
port:zlib
3030

3131
# Workaround xcrun: error: SDK "macosx12" cannot be located

‎graphics/opencv3-devel/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ patchfiles-append patch-find-openexr.diff
126126
# recognize dylib as a valid library suffix
127127
patchfiles-append patch-dylib_suffix.diff
128128

129-
# do not find protobuf3-cpp header files if installed
129+
# do not find protobuf header files if installed
130130
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
131131
patchfiles-append patch-local_protobuf.diff
132132

0 commit comments

Comments
 (0)