aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2023-11-11 11:34:26 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2023-11-11 11:38:19 +0000
commitf7e7a91e5d4c8e582fa5f649f8ccdc2a16f74d07 (patch)
treeda7ea87e70845fcda0aa2b539a3f76710ba7c52a
parent8f84f2f5b28a5f6399e15501b97a1aa45a2ae939 (diff)
downloadports-f7e7a91e5d4c8e582fa5f649f8ccdc2a16f74d07.tar.gz
ports-f7e7a91e5d4c8e582fa5f649f8ccdc2a16f74d07.zip
devel/nanopb: update 0.4.7-7 → 0.4.8
-rw-r--r--devel/nanopb/Makefile8
-rw-r--r--devel/nanopb/distinfo6
-rw-r--r--devel/nanopb/pkg-plist20
-rw-r--r--sysutils/qflipper/Makefile2
4 files changed, 22 insertions, 14 deletions
diff --git a/devel/nanopb/Makefile b/devel/nanopb/Makefile
index f694b9a1f0a8..a3900a212be4 100644
--- a/devel/nanopb/Makefile
+++ b/devel/nanopb/Makefile
@@ -1,6 +1,5 @@
PORTNAME= nanopb
-DISTVERSION= 0.4.7-7
-DISTVERSIONSUFFIX= -gee27d70
+DISTVERSION= 0.4.8
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
@@ -20,7 +19,10 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
-SHEBANG_FILES= generator/nanopb_generator.py generator/protoc-gen-nanopb
+SHEBANG_FILES= generator/nanopb_generator \
+ generator/nanopb_generator.py \
+ extra/script_wrappers/nanopb_generator.py.in \
+ generator/protoc-gen-nanopb
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD}
diff --git a/devel/nanopb/distinfo b/devel/nanopb/distinfo
index 9d8a43094057..01486969e2b9 100644
--- a/devel/nanopb/distinfo
+++ b/devel/nanopb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678602056
-SHA256 (nanopb-nanopb-0.4.7-7-gee27d70_GH0.tar.gz) = ab48b9548b7f190d669bb10e02b26067ad8abb2f35210fcfae85c343aa8ad305
-SIZE (nanopb-nanopb-0.4.7-7-gee27d70_GH0.tar.gz) = 1153849
+TIMESTAMP = 1699694058
+SHA256 (nanopb-nanopb-0.4.8_GH0.tar.gz) = 3f78bf63722a810edb6da5ab5f0e76c7db13a961c2aad4ab49296e3095d0d830
+SIZE (nanopb-nanopb-0.4.8_GH0.tar.gz) = 1163452
diff --git a/devel/nanopb/pkg-plist b/devel/nanopb/pkg-plist
index 92e606a13298..0b29c100778a 100644
--- a/devel/nanopb/pkg-plist
+++ b/devel/nanopb/pkg-plist
@@ -1,9 +1,10 @@
+bin/nanopb_generator
bin/nanopb_generator.py
bin/protoc-gen-nanopb
-include/pb.h
-include/pb_common.h
-include/pb_decode.h
-include/pb_encode.h
+include/nanopb/pb.h
+include/nanopb/pb_common.h
+include/nanopb/pb_decode.h
+include/nanopb/pb_encode.h
lib/cmake/nanopb/nanopb-config-version.cmake
lib/cmake/nanopb/nanopb-config.cmake
lib/cmake/nanopb/nanopb-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -11,7 +12,10 @@ lib/cmake/nanopb/nanopb-targets.cmake
lib/libprotobuf-nanopb.a
lib/libprotobuf-nanopb.so
lib/libprotobuf-nanopb.so.0
-%%PYTHON_SITELIBDIR%%/proto/__init__.py
-%%PYTHON_SITELIBDIR%%/proto/_utils.py
-%%PYTHON_SITELIBDIR%%/proto/nanopb.proto
-%%PYTHON_SITELIBDIR%%/proto/nanopb_pb2.py
+%%PYTHON_SITELIBDIR%%/nanopb/__init__.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/__init__.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/nanopb_generator.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__init__.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/_utils.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/nanopb.proto
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/nanopb_pb2.py
diff --git a/sysutils/qflipper/Makefile b/sysutils/qflipper/Makefile
index 5e4256310785..d731e029b248 100644
--- a/sysutils/qflipper/Makefile
+++ b/sysutils/qflipper/Makefile
@@ -19,6 +19,8 @@ USE_GL= gl
USE_QT= concurrent core declarative gui linguisttools network \
quickcontrols2 serialport svg widgets buildtools:build
+CFLAGS+= -I${LOCALBASE}/include/nanopb
+
PLIST_FILES= bin/qFlipper \
bin/qFlipper-cli \
lib/qt5/plugins/libflipperproto0.so \