with this the workaround for the newer libc++ can be dropped (both here
and in devel/poedit.)
I had to disable tests because it picks up the headers from gtest which
is too new for this.
The install path for the pc files was fixed upstream, here I've did the
minimum to get them installed in the right place.
devel/poedit which is the only consumer still works fine for me.
ok?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/textproc/luceneplusplus/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile 1 Jan 2024 21:22:12 -0000 1.4
+++ Makefile 24 Jan 2024 10:55:59 -0000
@@ -1,13 +1,13 @@
-V= 3.0.7
-PKGNAME= luceneplusplus-${V}
+V = 3.0.8
+PKGNAME = luceneplusplus-${V}
COMMENT = C++ port of the Java Lucene library, the text search engine
GH_ACCOUNT = luceneplusplus
GH_PROJECT = LucenePlusPlus
GH_TAGNAME = rel_${V}
-SHARED_LIBS += lucene++ 0.0
-SHARED_LIBS += lucene++-contrib 0.0
+SHARED_LIBS += lucene++ 1.0
+SHARED_LIBS += lucene++-contrib 1.0
CATEGORIES = textproc
@@ -17,19 +17,18 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} m
WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
WANTLIB += boost_filesystem-mt boost_iostreams-mt boost_regex-mt
-WANTLIB += boost_system-mt boost_thread-mt
+WANTLIB += boost_system-mt boost_thread-mt z
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
-BUILD_DEPENDS = devel/gtest
LIB_DEPENDS = devel/boost
-MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+# devel/gtest is too new for this
+CONFIGURE_ARGS += -DENABLE_TEST=FALSE
-# Remove after update to >= 3.0.8
-CXXFLAGS += -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
do-test:
cd ${WRKBUILD} && ./src/test/lucene++-tester \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/textproc/luceneplusplus/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- distinfo 5 Jul 2020 07:30:16 -0000 1.1.1.1
+++ distinfo 29 Dec 2023 15:03:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (LucenePlusPlus-3.0.7.tar.gz) =
bBnyAzEeS0SgzPexEn23dDbrRxWeocVPdTGgscpYXgw=
-SIZE (LucenePlusPlus-3.0.7.tar.gz) = 2013570
+SHA256 (LucenePlusPlus-3.0.8.tar.gz) =
r1z1mpPPbc6Ggo4QjgEDWVF8Jc5IcVKvaFIHhdGDgTw=
+SIZE (LucenePlusPlus-3.0.8.tar.gz) = 2456644
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /home/cvs/ports/textproc/luceneplusplus/patches/patch-CMakeLists_txt,v
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Mar 2022 20:02:42 -0000 1.2
+++ patches/patch-CMakeLists_txt 29 Dec 2023 15:11:58 -0000
@@ -3,24 +3,12 @@ disable cotire as it's deprecated and br
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -15,11 +15,6 @@ set(lucene++_VERSION
- # include specific modules
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
--####################################
--# pre-compiled headers support
--####################################
--include(cotire)
--
- # if setup using the Toolchain-llvm.cmake file, then use llvm...
- if(ENABLE_LLVM)
- include(Toolchain-llvm)
-@@ -85,7 +80,7 @@ include(TestCXXAcceptsFlag)
- include(GNUInstallDirs)
+@@ -21,7 +21,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_T
+ endif()
set(LIB_DESTINATION
-- "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory
name"
-+ "lib" CACHE STRING "Define lib output directory name"
- )
+- "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory
name")
++ "lib" CACHE STRING "Define lib output directory name")
+
- if(ENABLE_CYCLIC_CHECK)
+ ####################################
Index: patches/patch-include_VariantUtils_h
===================================================================
RCS file: patches/patch-include_VariantUtils_h
diff -N patches/patch-include_VariantUtils_h
--- patches/patch-include_VariantUtils_h 11 Mar 2022 20:02:42 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-Index: include/VariantUtils.h
---- include/VariantUtils.h.orig
-+++ include/VariantUtils.h
-@@ -8,6 +8,7 @@
- #define VARIANTUTILS_H
-
- #include <boost/any.hpp>
-+#include <boost/version.hpp>
- #include "Lucene.h"
- #include "MiscUtils.h"
-
-@@ -22,7 +23,11 @@ class LPPAPI VariantUtils { (public)
-
- template <typename TYPE, typename VAR>
- static TYPE get(VAR var) {
-+#if BOOST_VERSION < 105800
- return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
-+#else
-+ return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) :
TYPE();
-+#endif
- }
-
- template <typename TYPE, typename VAR>
Index: patches/patch-src_config_contrib_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_config_contrib_CMakeLists_txt
diff -N patches/patch-src_config_contrib_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_config_contrib_CMakeLists_txt 24 Jan 2024 10:51:22
-0000
@@ -0,0 +1,14 @@
+fix pkgconfig install path
+
+Index: src/config/contrib/CMakeLists.txt
+--- src/config/contrib/CMakeLists.txt.orig
++++ src/config/contrib/CMakeLists.txt
+@@ -9,7 +9,7 @@ if(NOT WIN32)
+ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
+- DESTINATION "include/pkgconfig")
++ DESTINATION "lib/pkgconfig")
+ endif()
+
+
Index: patches/patch-src_config_core_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_config_core_CMakeLists_txt
diff -N patches/patch-src_config_core_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_config_core_CMakeLists_txt 24 Jan 2024 10:49:08
-0000
@@ -0,0 +1,14 @@
+fix pkgconfig install path
+
+Index: src/config/core/CMakeLists.txt
+--- src/config/core/CMakeLists.txt.orig
++++ src/config/core/CMakeLists.txt
+@@ -9,7 +9,7 @@ if(NOT WIN32)
+ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
+- DESTINATION "include/pkgconfig")
++ DESTINATION "lib/pkgconfig")
+ endif()
+
+
Index: patches/patch-src_contrib_CMakeLists_txt
===================================================================
RCS file:
/home/cvs/ports/textproc/luceneplusplus/patches/patch-src_contrib_CMakeLists_txt,v
diff -u -p -r1.2 patch-src_contrib_CMakeLists_txt
--- patches/patch-src_contrib_CMakeLists_txt 11 Mar 2022 20:02:42 -0000
1.2
+++ patches/patch-src_contrib_CMakeLists_txt 29 Dec 2023 15:11:58 -0000
@@ -3,12 +3,12 @@ disable cotire as it's deprecated and br
Index: src/contrib/CMakeLists.txt
--- src/contrib/CMakeLists.txt.orig
+++ src/contrib/CMakeLists.txt
-@@ -50,8 +50,6 @@ target_link_libraries(lucene++-contrib
- lucene++
- )
-
+@@ -85,8 +85,6 @@ set_target_properties(lucene++
+ VERSION ${lucene++_VERSION}
+ SOVERSION ${lucene++_SOVERSION})
+
-cotire(lucene++-contrib)
-
install(TARGETS lucene++-contrib
DESTINATION "${LIB_DESTINATION}"
- COMPONENT runtime
+ COMPONENT runtime)
Index: patches/patch-src_core_CMakeLists_txt
===================================================================
RCS file:
/home/cvs/ports/textproc/luceneplusplus/patches/patch-src_core_CMakeLists_txt,v
diff -u -p -r1.2 patch-src_core_CMakeLists_txt
--- patches/patch-src_core_CMakeLists_txt 11 Mar 2022 20:02:42 -0000
1.2
+++ patches/patch-src_core_CMakeLists_txt 29 Dec 2023 15:11:58 -0000
@@ -3,11 +3,13 @@ disable cotire as it's deprecated and br
Index: src/core/CMakeLists.txt
--- src/core/CMakeLists.txt.orig
+++ src/core/CMakeLists.txt
-@@ -39,7 +39,6 @@ if(WIN32)
- endif()
+@@ -79,9 +79,6 @@ set_target_properties(lucene++
+ VERSION ${lucene++_VERSION}
+ SOVERSION ${lucene++_SOVERSION})
- set_target_properties(lucene++ PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT
"include/LuceneInc.h")
-cotire(lucene++)
-
- set_target_properties(lucene++ PROPERTIES
- VERSION ${lucene++_VERSION}
+-
+-
+ install(TARGETS lucene++
+ DESTINATION "${LIB_DESTINATION}"
+ COMPONENT runtime)
Index: patches/patch-src_test_CMakeLists_txt
===================================================================
RCS file:
/home/cvs/ports/textproc/luceneplusplus/patches/patch-src_test_CMakeLists_txt,v
diff -u -p -r1.2 patch-src_test_CMakeLists_txt
--- patches/patch-src_test_CMakeLists_txt 11 Mar 2022 20:02:42 -0000
1.2
+++ patches/patch-src_test_CMakeLists_txt 29 Dec 2023 15:42:13 -0000
@@ -1,20 +1,11 @@
-use gtest from ports and disable cotire as it's deprecated and breaks
-the build with newer libc++
+disable cotire as it's deprecated and breaks the build with newer libc++
Index: src/test/CMakeLists.txt
--- src/test/CMakeLists.txt.orig
+++ src/test/CMakeLists.txt
-@@ -1,7 +1,5 @@
- project(lucene++-tester)
-
--add_subdirectory(gtest)
--
- include_directories(
- "${gtest_SOURCE_DIR}/include"
- "${lucene++_SOURCE_DIR}/include"
-@@ -50,5 +48,3 @@ target_link_libraries(lucene++-tester
- gtest
- ${lucene_boost_libs}
- )
+@@ -77,5 +77,3 @@ target_link_libraries(lucene++-tester
+ # link args
+ ####################################
+ target_compile_options(lucene++-tester PRIVATE -DLPP_EXPOSE_INTERNAL)
-
-cotire(lucene++-tester)
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/textproc/luceneplusplus/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 20:02:43 -0000 1.2
+++ pkg/PLIST 24 Jan 2024 10:54:18 -0000
@@ -1,15 +1,14 @@
+include/cmake/
+include/cmake/liblucene++-contribConfig.cmake
+include/cmake/liblucene++-contribConfigVersion.cmake
+include/cmake/liblucene++Config.cmake
+include/cmake/liblucene++ConfigVersion.cmake
include/lucene++/
include/lucene++/ASCIIFoldingFilter.h
include/lucene++/AbstractAllTermDocs.h
include/lucene++/AbstractField.h
include/lucene++/AllTermDocs.h
include/lucene++/Analyzer.h
-include/lucene++/ArabicAnalyzer.h
-include/lucene++/ArabicLetterTokenizer.h
-include/lucene++/ArabicNormalizationFilter.h
-include/lucene++/ArabicNormalizer.h
-include/lucene++/ArabicStemFilter.h
-include/lucene++/ArabicStemmer.h
include/lucene++/Array.h
include/lucene++/Attribute.h
include/lucene++/AttributeSource.h
@@ -23,9 +22,6 @@ include/lucene++/BooleanClause.h
include/lucene++/BooleanQuery.h
include/lucene++/BooleanScorer.h
include/lucene++/BooleanScorer2.h
-include/lucene++/BrazilianAnalyzer.h
-include/lucene++/BrazilianStemFilter.h
-include/lucene++/BrazilianStemmer.h
include/lucene++/BufferedDeletes.h
include/lucene++/BufferedIndexInput.h
include/lucene++/BufferedIndexOutput.h
@@ -34,8 +30,6 @@ include/lucene++/ByteBlockPool.h
include/lucene++/ByteFieldSource.h
include/lucene++/ByteSliceReader.h
include/lucene++/ByteSliceWriter.h
-include/lucene++/CJKAnalyzer.h
-include/lucene++/CJKTokenizer.h
include/lucene++/CachingSpanFilter.h
include/lucene++/CachingTokenFilter.h
include/lucene++/CachingWrapperFilter.h
@@ -49,9 +43,6 @@ include/lucene++/CharTokenizer.h
include/lucene++/CheckIndex.h
include/lucene++/ChecksumIndexInput.h
include/lucene++/ChecksumIndexOutput.h
-include/lucene++/ChineseAnalyzer.h
-include/lucene++/ChineseFilter.h
-include/lucene++/ChineseTokenizer.h
include/lucene++/CloseableThreadLocal.h
include/lucene++/Collator.h
include/lucene++/Collection.h
@@ -65,14 +56,11 @@ include/lucene++/Config.h
include/lucene++/ConjunctionScorer.h
include/lucene++/ConstantScoreQuery.h
include/lucene++/Constants.h
-include/lucene++/ContribInc.h
include/lucene++/CustomScoreProvider.h
include/lucene++/CustomScoreQuery.h
include/lucene++/CycleCheck.h
-include/lucene++/CzechAnalyzer.h
include/lucene++/DateField.h
include/lucene++/DateTools.h
-include/lucene++/DefaultEncoder.h
include/lucene++/DefaultSimilarity.h
include/lucene++/DefaultSkipListReader.h
include/lucene++/DefaultSkipListWriter.h
@@ -103,11 +91,6 @@ include/lucene++/Document.h
include/lucene++/DocumentsWriter.h
include/lucene++/DocumentsWriterThreadState.h
include/lucene++/DoubleFieldSource.h
-include/lucene++/DutchAnalyzer.h
-include/lucene++/DutchStemFilter.h
-include/lucene++/DutchStemmer.h
-include/lucene++/ElisionFilter.h
-include/lucene++/Encoder.h
include/lucene++/ExactPhraseScorer.h
include/lucene++/Explanation.h
include/lucene++/FSDirectory.h
@@ -154,27 +137,14 @@ include/lucene++/FormatPostingsPositions
include/lucene++/FormatPostingsPositionsWriter.h
include/lucene++/FormatPostingsTermsConsumer.h
include/lucene++/FormatPostingsTermsWriter.h
-include/lucene++/Formatter.h
-include/lucene++/Fragmenter.h
-include/lucene++/FrenchAnalyzer.h
-include/lucene++/FrenchStemFilter.h
-include/lucene++/FrenchStemmer.h
include/lucene++/FreqProxFieldMergeState.h
include/lucene++/FreqProxTermsWriter.h
include/lucene++/FreqProxTermsWriterPerField.h
include/lucene++/FreqProxTermsWriterPerThread.h
include/lucene++/FuzzyQuery.h
include/lucene++/FuzzyTermEnum.h
-include/lucene++/GermanAnalyzer.h
-include/lucene++/GermanStemFilter.h
-include/lucene++/GermanStemmer.h
-include/lucene++/GradientFormatter.h
-include/lucene++/GreekAnalyzer.h
-include/lucene++/GreekLowerCaseFilter.h
include/lucene++/HashMap.h
include/lucene++/HashSet.h
-include/lucene++/Highlighter.h
-include/lucene++/HighlighterScorer.h
include/lucene++/HitQueue.h
include/lucene++/HitQueueBase.h
include/lucene++/ISOLatin1AccentFilter.h
@@ -213,7 +183,6 @@ include/lucene++/LowerCaseFilter.h
include/lucene++/LowerCaseTokenizer.h
include/lucene++/Lucene.h
include/lucene++/LuceneAllocator.h
-include/lucene++/LuceneContrib.h
include/lucene++/LuceneException.h
include/lucene++/LuceneFactory.h
include/lucene++/LuceneHeaders.h
@@ -226,11 +195,9 @@ include/lucene++/MMapDirectory.h
include/lucene++/Map.h
include/lucene++/MapFieldSelector.h
include/lucene++/MapOfSets.h
-include/lucene++/MapWeightedSpanTerm.h
include/lucene++/MappingCharFilter.h
include/lucene++/MatchAllDocsQuery.h
include/lucene++/MaxPayloadFunction.h
-include/lucene++/MemoryIndex.h
include/lucene++/MergeDocIDRemapper.h
include/lucene++/MergePolicy.h
include/lucene++/MergeScheduler.h
@@ -253,7 +220,6 @@ include/lucene++/NormalizeCharMap.h
include/lucene++/NormsWriter.h
include/lucene++/NormsWriterPerField.h
include/lucene++/NormsWriterPerThread.h
-include/lucene++/NullFragmenter.h
include/lucene++/NumberTools.h
include/lucene++/NumericField.h
include/lucene++/NumericRangeFilter.h
@@ -274,9 +240,6 @@ include/lucene++/PayloadNearQuery.h
include/lucene++/PayloadSpanUtil.h
include/lucene++/PayloadTermQuery.h
include/lucene++/PerFieldAnalyzerWrapper.h
-include/lucene++/PersianAnalyzer.h
-include/lucene++/PersianNormalizationFilter.h
-include/lucene++/PersianNormalizer.h
include/lucene++/PhrasePositions.h
include/lucene++/PhraseQuery.h
include/lucene++/PhraseQueue.h
@@ -297,9 +260,6 @@ include/lucene++/QueryParserCharStream.h
include/lucene++/QueryParserConstants.h
include/lucene++/QueryParserToken.h
include/lucene++/QueryParserTokenManager.h
-include/lucene++/QueryScorer.h
-include/lucene++/QueryTermExtractor.h
-include/lucene++/QueryTermScorer.h
include/lucene++/QueryTermVector.h
include/lucene++/QueryWrapperFilter.h
include/lucene++/RAMDirectory.h
@@ -316,12 +276,6 @@ include/lucene++/ReqExclScorer.h
include/lucene++/ReqOptSumScorer.h
include/lucene++/ReusableStringReader.h
include/lucene++/ReverseOrdFieldSource.h
-include/lucene++/ReverseStringFilter.h
-include/lucene++/RussianAnalyzer.h
-include/lucene++/RussianLetterTokenizer.h
-include/lucene++/RussianLowerCaseFilter.h
-include/lucene++/RussianStemFilter.h
-include/lucene++/RussianStemmer.h
include/lucene++/ScoreCachingWrappingScorer.h
include/lucene++/ScoreDoc.h
include/lucene++/Scorer.h
@@ -349,18 +303,12 @@ include/lucene++/SimilarityDelegator.h
include/lucene++/SimpleAnalyzer.h
include/lucene++/SimpleFSDirectory.h
include/lucene++/SimpleFSLockFactory.h
-include/lucene++/SimpleFragmenter.h
-include/lucene++/SimpleHTMLEncoder.h
-include/lucene++/SimpleHTMLFormatter.h
include/lucene++/SimpleLRUCache.h
-include/lucene++/SimpleSpanFragmenter.h
include/lucene++/SingleInstanceLockFactory.h
include/lucene++/SingleTermEnum.h
include/lucene++/SloppyPhraseScorer.h
include/lucene++/SmallDouble.h
include/lucene++/SnapshotDeletionPolicy.h
-include/lucene++/SnowballAnalyzer.h
-include/lucene++/SnowballFilter.h
include/lucene++/Sort.h
include/lucene++/SortField.h
include/lucene++/SortedTermVectorMapper.h
@@ -368,7 +316,6 @@ include/lucene++/SortedVIntList.h
include/lucene++/SpanFilter.h
include/lucene++/SpanFilterResult.h
include/lucene++/SpanFirstQuery.h
-include/lucene++/SpanGradientFormatter.h
include/lucene++/SpanNearQuery.h
include/lucene++/SpanNotQuery.h
include/lucene++/SpanOrQuery.h
@@ -423,13 +370,10 @@ include/lucene++/TermsHashConsumerPerThr
include/lucene++/TermsHashPerField.h
include/lucene++/TermsHashPerThread.h
include/lucene++/TestPoint.h
-include/lucene++/TextFragment.h
include/lucene++/ThreadPool.h
include/lucene++/TimeLimitingCollector.h
include/lucene++/Token.h
include/lucene++/TokenFilter.h
-include/lucene++/TokenGroup.h
-include/lucene++/TokenSources.h
include/lucene++/TokenStream.h
include/lucene++/Tokenizer.h
include/lucene++/TopDocs.h
@@ -444,9 +388,6 @@ include/lucene++/ValueSource.h
include/lucene++/ValueSourceQuery.h
include/lucene++/VariantUtils.h
include/lucene++/Weight.h
-include/lucene++/WeightedSpanTerm.h
-include/lucene++/WeightedSpanTermExtractor.h
-include/lucene++/WeightedTerm.h
include/lucene++/WhitespaceAnalyzer.h
include/lucene++/WhitespaceTokenizer.h
include/lucene++/WildcardQuery.h
