<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8f2aa54d49c97d1d4d21a09e5a746b38d83723f1">https://github.com/macports/macports-ports/commit/8f2aa54d49c97d1d4d21a09e5a746b38d83723f1</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 8f2aa54d49c LucenePlusPlus: update to 3.0.8, fix build, add tests
</span>8f2aa54d49c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f2aa54d49c97d1d4d21a09e5a746b38d83723f1
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Dec 19 17:48:36 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> LucenePlusPlus: update to 3.0.8, fix build, add tests
</span>---
devel/LucenePlusPlus/Portfile | 58 ++++++++++++++--------
devel/LucenePlusPlus/files/patch-boost-1.58.diff | 39 ---------------
.../files/patch-pkgconfig-libdir.diff | 51 -------------------
3 files changed, 37 insertions(+), 111 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/LucenePlusPlus/Portfile b/devel/LucenePlusPlus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5957a7f3c6..35a273045ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/LucenePlusPlus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/LucenePlusPlus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span> PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup luceneplusplus LucenePlusPlus 3.0.7 rel_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.78
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup luceneplusplus LucenePlusPlus 3.0.8 rel_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> license GPL-3+
description High-performance, full-featured text search engine for C++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,24 +19,37 @@ description High-performance, full-featured text search engine for C++
</span> long_description Lucene++ is an up to date C++ port of the popular Java Lucene library, \
a high-performance, full-featured text search engine.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# stealth update; remove for next version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ceff405f1f9f71b1417f0e4cc2d402bb4759c3b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f4dcad6942b704ec0ba6ead4427ae9b9d053a2d8d23ccf024f818a7cde03999b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2013995
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1a7ee78ac5e84f0354f29febfe3f49bb55fce956 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af5cf59a93cf6dce86828e108e010359517c25ce487152af68520785d183813c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2456644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build gtest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-boost-1.58.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pkgconfig-libdir.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Avoid case-insensitive name clash of ${prefix}/include/term.h from ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# with Term.h in this build by removing the default -I${prefix}/include argument.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The build system will pick up CPATH instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DEMO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TEST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_GTEST=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# While on PowerPC all tests pass, on new systems build fails at the moment:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/luceneplusplus/LucenePlusPlus/issues/199
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "Support testing" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TEST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TEST=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 1998
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.dir ${cmake.build_dir}/src/test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ./lucene++-tester
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.post_args --test_dir="${worksrcpath}/src/test/testfiles"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/LucenePlusPlus/files/patch-boost-1.58.diff b/devel/LucenePlusPlus/files/patch-boost-1.58.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b4ad491210e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/LucenePlusPlus/files/patch-boost-1.58.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1987082cf9278a639d772b4f35a8ae2d34944177 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 4 May 2015 18:04:46 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation with Boost 1.58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.58 introduces strict type checking in boost::get() and while that's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-good in theory, the VariantUtils code makes it impractical to use.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exist in older versions of Boost, so the code must check BOOST_VERSION.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #93.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/VariantUtils.h | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/VariantUtils.h b/include/VariantUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1e6c243..5a72e59 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/VariantUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/VariantUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VARIANTUTILS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/any.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/version.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Lucene.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "MiscUtils.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +23,11 @@ class LPPAPI VariantUtils {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename TYPE, typename VAR>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static TYPE get(VAR var) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if BOOST_VERSION < 105800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename TYPE, typename VAR>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff b/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd0c3729ef0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From dd6ba769ea8b411d6e09720dfe7f38d027d8f8fc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 28 Apr 2015 09:31:35 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix packageconfig path. Rationale: LIB_DESTINATION is set as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_INSTALL_FULL_LIBDIR. So repeating "{prefix}" results in a double
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usr/usr inclusion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liblucene++-contrib.pc.cmake | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liblucene++.pc.cmake | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/liblucene++-contrib.pc.cmake b/liblucene++-contrib.pc.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 98b6381..21026e0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/liblucene++-contrib.pc.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/liblucene++-contrib.pc.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,13 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=@CMAKE_INSTALL_PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec_prefix=${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libdir=${prefix}/@LIB_DESTINATION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libdir=@LIB_DESTINATION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- includedir=${prefix}/include/lucene++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib=lucene++-contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Name: liblucene++-contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @lucene++_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${prefix}/@LIB_DESTINATION@ -l${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L@LIB_DESTINATION@ -l${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires: liblucene++ = @lucene++_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/liblucene++.pc.cmake b/liblucene++.pc.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c526d4a..32d16ad 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/liblucene++.pc.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/liblucene++.pc.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=@CMAKE_INSTALL_PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec_prefix=${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libdir=${prefix}/@LIB_DESTINATION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libdir=@LIB_DESTINATION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- includedir=${prefix}/include/lucene++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib=lucene++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Name: liblucene++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @lucene++_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${prefix}/@LIB_DESTINATION@ -l${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L@LIB_DESTINATION@ -l${lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>