git: 0055ae581c7e - main - devel/avro-c: Convert REINPLACE_CMD to USES=shebangfix and patch file
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Mar 2023 19:24:36 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0055ae581c7e8a0533373d3f6b8f793dfd314123
commit 0055ae581c7e8a0533373d3f6b8f793dfd314123
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-03-21 18:39:42 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-03-21 19:20:02 +0000
devel/avro-c: Convert REINPLACE_CMD to USES=shebangfix and patch file
---
devel/avro-c/Makefile | 7 +++----
devel/avro-c/files/patch-CMakeLists.txt | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/devel/avro-c/Makefile b/devel/avro-c/Makefile
index ca0b0d705530..6b3bf6217432 100644
--- a/devel/avro-c/Makefile
+++ b/devel/avro-c/Makefile
@@ -17,14 +17,13 @@ BROKEN_sparc64= fails to build
LIB_DEPENDS= libjansson.so:devel/jansson \
libsnappy.so:archivers/snappy
-USES= cmake compiler:c++11-lang cpe pathfix pkgconfig
+USES= cmake compiler:c++11-lang cpe pathfix pkgconfig shebangfix
USE_LDCONFIG= yes
CPE_VENDOR= apache
-post-patch:
- @${REINPLACE_CMD} '/SNAPPY_PKG/ s|libsnappy|snappy|; /add_subdirectory(docs)/d' ${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} '1 s|/bin/bash|/bin/sh|' ${WRKSRC}/version.sh
+SHEBANG_FILES= version.sh
+bash_CMD= /bin/sh
.include <bsd.port.mk>
diff --git a/devel/avro-c/files/patch-CMakeLists.txt b/devel/avro-c/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2b5557e4952b
--- /dev/null
+++ b/devel/avro-c/files/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig 2022-02-23 16:45:22 UTC
++++ CMakeLists.txt
+@@ -151,7 +151,7 @@ endif (ZLIB_FOUND)
+
+ find_package(Snappy)
+ if (SNAPPY_FOUND AND ZLIB_FOUND) # Snappy borrows crc32 from zlib
+- set(SNAPPY_PKG libsnappy)
++ set(SNAPPY_PKG snappy)
+ add_definitions(-DSNAPPY_CODEC)
+ include_directories(${SNAPPY_INCLUDE_DIRS})
+ message("Enabled snappy codec")
+@@ -192,7 +192,6 @@ endif (JANSSON_FOUND)
+ add_subdirectory(src)
+ add_subdirectory(examples)
+ add_subdirectory(tests)
+-add_subdirectory(docs)
+
+ add_custom_target(pretty
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake_pretty.cmake")