<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e0ebaa4954b7572009416cbd48cbe9318102f9b1">https://github.com/macports/macports-ports/commit/e0ebaa4954b7572009416cbd48cbe9318102f9b1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e0ebaa4954b duckdb: Install duckdb program in the right place
</span>e0ebaa4954b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e0ebaa4954b7572009416cbd48cbe9318102f9b1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Feb 26 21:27:10 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> duckdb: Install duckdb program in the right place
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66990
</span>---
databases/duckdb/Portfile | 9 +++------
databases/duckdb/files/install.patch | 11 +++++++++++
databases/duckdb/files/no-ccache.patch | 11 +++++++++++
3 files changed, 25 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/duckdb/Portfile b/databases/duckdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e7a63c2c68..afaf108b5e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup legacysupport 1.0
</span> PortGroup openssl 1.0
github.setup cwida duckdb 0.7.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
homepage https://www.duckdb.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,8 @@ license MIT
</span> maintainers {gmail.com:herby.gillot @herbygillot} \
openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable use of ccache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/find_program(CCACHE_PROGRAM ccache)/ d} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles install.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-ccache.patch
</span>
configure.args-append \
-DBUILD_PARQUET_EXTENSION=TRUE \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/duckdb/files/install.patch b/databases/duckdb/files/install.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..359e22cfe9a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/duckdb/files/install.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install duckdb program in the correct directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/duckdb/duckdb/issues/6255
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/duckdb/duckdb/commit/773b6d9b076c48ce46e13f97e3353fb3e41f1788
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/shell/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/shell/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,4 +28,4 @@ set_target_properties(shell PROPERTIES OUTPUT_NAME duckdb)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(shell PROPERTIES RUNTIME_OUTPUT_DIRECTORY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PROJECT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(TARGETS shell RUNTIME DESTINATION "${PROJECT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS shell RUNTIME DESTINATION "${INSTALL_BIN_DIR}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/duckdb/files/no-ccache.patch b/databases/duckdb/files/no-ccache.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a471d67ad44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/duckdb/files/no-ccache.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable use of ccache.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-02-26 21:24:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-02-26 21:26:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MACOSX_RPATH 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_program(CCACHE_PROGRAM ccache)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CCACHE_PROGRAM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span></pre><pre style='margin:0'>
</pre>