Updated package to version 2.3.3.4. This is an update of a very old

version, so I'm not including the entire changelog here; see the package
changelog for more details. The patch was originally submitted by
Francois Tigeot as PR pkg/46156 - I've updated it since.

10 files changed, 195 insertions, 133 deletions

diff --git a/textproc/libclucene/Makefile b/textproc/libclucene/Makefile
index e6ceef98598..91daf1e2dd3 100644
--- a/textproc/libclucene/Makefile
+++ b/textproc/libclucene/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/11/16 01:07:26 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2013/08/11 16:06:25 jaapb Exp $
 
-DISTNAME=		clucene-core-0.9.21b
+DISTNAME=		clucene-core-2.3.3.4
 PKGNAME=		lib${DISTNAME:S/-core-/-/}
-PKGREVISION=		1
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clucene/}
 
@@ -11,9 +10,14 @@ HOMEPAGE=		http://clucene.sourceforge.net/index.php/Main_Page
 COMMENT=		Text search engine written in C++
 LICENSE=		gnu-lgpl-v2.1 OR apache-2.0
 
-USE_TOOLS+=		gmake
+PKGCONFIG_OVERRIDE+=	libclucene-core.pc.in
+
 USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		yes
+USE_CMAKE=		yes
+CMAKE_ARGS+=		-DBUILD_CONTRIBS_LIB=ON
+#BUILD_TARGET+=	clucene-contribs-lib
 USE_LIBTOOL=		yes
 
+.include "../../devel/boost-libs/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libclucene/PLIST b/textproc/libclucene/PLIST
index 12208e7a36e..6a6e4d46b08 100644
--- a/textproc/libclucene/PLIST
+++ b/textproc/libclucene/PLIST
@@ -1,132 +1,179 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/08/11 16:06:25 jaapb Exp $
 include/CLucene.h
-include/CLucene/CLBackwards.h
 include/CLucene/CLConfig.h
+include/CLucene/CLuceneConfig.cmake
 include/CLucene/LuceneThreads.h
+include/CLucene/SharedHeader.h
 include/CLucene/StdHeader.h
 include/CLucene/analysis/AnalysisHeader.h
 include/CLucene/analysis/Analyzers.h
+include/CLucene/analysis/CachingTokenFilter.h
+include/CLucene/analysis/LanguageBasedAnalyzer.h
+include/CLucene/analysis/PorterStemmer.h
+include/CLucene/analysis/cjk/CJKAnalyzer.h
+include/CLucene/analysis/de/GermanAnalyzer.h
+include/CLucene/analysis/de/GermanStemFilter.h
+include/CLucene/analysis/de/GermanStemmer.h
 include/CLucene/analysis/standard/StandardAnalyzer.h
 include/CLucene/analysis/standard/StandardFilter.h
 include/CLucene/analysis/standard/StandardTokenizer.h
 include/CLucene/analysis/standard/StandardTokenizerConstants.h
-include/CLucene/config/CompilerBcb.h
-include/CLucene/config/CompilerGcc.h
-include/CLucene/config/CompilerMsvc.h
-include/CLucene/config/PlatformMac.h
-include/CLucene/config/PlatformUnix.h
-include/CLucene/config/PlatformWin32.h
-include/CLucene/config/compiler.h
-include/CLucene/config/define_std.h
-include/CLucene/config/gunichartables.h
-include/CLucene/config/repl_tchar.h
-include/CLucene/config/repl_wchar.h
-include/CLucene/config/threadCSection.h
-include/CLucene/config/threadPthread.h
-include/CLucene/debug/condition.h
+include/CLucene/clucene-config.h
 include/CLucene/debug/error.h
 include/CLucene/debug/lucenebase.h
 include/CLucene/debug/mem.h
 include/CLucene/document/DateField.h
+include/CLucene/document/DateTools.h
 include/CLucene/document/Document.h
 include/CLucene/document/Field.h
-include/CLucene/index/CompoundFile.h
-include/CLucene/index/DocumentWriter.h
-include/CLucene/index/FieldInfo.h
-include/CLucene/index/FieldInfos.h
-include/CLucene/index/FieldsReader.h
-include/CLucene/index/FieldsWriter.h
+include/CLucene/document/FieldSelector.h
+include/CLucene/document/NumberTools.h
+include/CLucene/highlighter/Encoder.h
+include/CLucene/highlighter/Formatter.h
+include/CLucene/highlighter/Fragmenter.h
+include/CLucene/highlighter/HighlightScorer.h
+include/CLucene/highlighter/Highlighter.h
+include/CLucene/highlighter/QueryScorer.h
+include/CLucene/highlighter/QueryTermExtractor.h
+include/CLucene/highlighter/Scorer.h
+include/CLucene/highlighter/SimpleFragmenter.h
+include/CLucene/highlighter/SimpleHTMLEncoder.h
+include/CLucene/highlighter/SimpleHTMLFormatter.h
+include/CLucene/highlighter/TextFragment.h
+include/CLucene/highlighter/TokenGroup.h
+include/CLucene/highlighter/TokenSources.h
+include/CLucene/highlighter/WeightedTerm.h
+include/CLucene/index/DirectoryIndexReader.h
+include/CLucene/index/IndexDeletionPolicy.h
 include/CLucene/index/IndexModifier.h
 include/CLucene/index/IndexReader.h
 include/CLucene/index/IndexWriter.h
+include/CLucene/index/MergePolicy.h
+include/CLucene/index/MergeScheduler.h
 include/CLucene/index/MultiReader.h
-include/CLucene/index/SegmentHeader.h
-include/CLucene/index/SegmentInfos.h
-include/CLucene/index/SegmentMergeInfo.h
-include/CLucene/index/SegmentMergeQueue.h
-include/CLucene/index/SegmentMerger.h
-include/CLucene/index/SegmentTermEnum.h
+include/CLucene/index/MultipleTermPositions.h
+include/CLucene/index/Payload.h
 include/CLucene/index/Term.h
-include/CLucene/index/TermInfo.h
-include/CLucene/index/TermInfosReader.h
-include/CLucene/index/TermInfosWriter.h
 include/CLucene/index/TermVector.h
 include/CLucene/index/Terms.h
-include/CLucene/queryParser/Lexer.h
 include/CLucene/queryParser/MultiFieldQueryParser.h
 include/CLucene/queryParser/QueryParser.h
-include/CLucene/queryParser/QueryParserBase.h
+include/CLucene/queryParser/QueryParserConstants.h
+include/CLucene/queryParser/QueryParserTokenManager.h
 include/CLucene/queryParser/QueryToken.h
-include/CLucene/queryParser/TokenList.h
+include/CLucene/queryParser/legacy/MultiFieldQueryParser.h
+include/CLucene/queryParser/legacy/QueryParser.h
+include/CLucene/queryParser/legacy/QueryToken.h
 include/CLucene/search/BooleanClause.h
 include/CLucene/search/BooleanQuery.h
-include/CLucene/search/BooleanScorer.h
+include/CLucene/search/CachingSpanFilter.h
 include/CLucene/search/CachingWrapperFilter.h
 include/CLucene/search/ChainedFilter.h
 include/CLucene/search/Compare.h
-include/CLucene/search/ConjunctionScorer.h
+include/CLucene/search/ConstantScoreQuery.h
 include/CLucene/search/DateFilter.h
-include/CLucene/search/ExactPhraseScorer.h
 include/CLucene/search/Explanation.h
 include/CLucene/search/FieldCache.h
-include/CLucene/search/FieldCacheImpl.h
 include/CLucene/search/FieldDoc.h
-include/CLucene/search/FieldDocSortedHitQueue.h
 include/CLucene/search/FieldSortedHitQueue.h
 include/CLucene/search/Filter.h
+include/CLucene/search/FilterResultCache.h
 include/CLucene/search/FilteredTermEnum.h
 include/CLucene/search/FuzzyQuery.h
-include/CLucene/search/HitQueue.h
+include/CLucene/search/Hits.h
 include/CLucene/search/IndexSearcher.h
+include/CLucene/search/MatchAllDocsQuery.h
+include/CLucene/search/MultiPhraseQuery.h
 include/CLucene/search/MultiSearcher.h
 include/CLucene/search/MultiTermQuery.h
-include/CLucene/search/PhrasePositions.h
 include/CLucene/search/PhraseQuery.h
-include/CLucene/search/PhraseQueue.h
-include/CLucene/search/PhraseScorer.h
 include/CLucene/search/PrefixQuery.h
+include/CLucene/search/Query.h
 include/CLucene/search/QueryFilter.h
 include/CLucene/search/RangeFilter.h
 include/CLucene/search/RangeQuery.h
 include/CLucene/search/Scorer.h
+include/CLucene/search/ScorerDocQueue.h
 include/CLucene/search/SearchHeader.h
+include/CLucene/search/Searchable.h
 include/CLucene/search/Similarity.h
-include/CLucene/search/SloppyPhraseScorer.h
 include/CLucene/search/Sort.h
+include/CLucene/search/SpanFilter.h
+include/CLucene/search/SpanFilterResult.h
+include/CLucene/search/SpanQueryFilter.h
 include/CLucene/search/TermQuery.h
-include/CLucene/search/TermScorer.h
 include/CLucene/search/WildcardQuery.h
 include/CLucene/search/WildcardTermEnum.h
+include/CLucene/search/spans/SpanFirstQuery.h
+include/CLucene/search/spans/SpanNearQuery.h
+include/CLucene/search/spans/SpanNotQuery.h
+include/CLucene/search/spans/SpanOrQuery.h
+include/CLucene/search/spans/SpanQuery.h
+include/CLucene/search/spans/SpanScorer.h
+include/CLucene/search/spans/SpanTermQuery.h
+include/CLucene/search/spans/SpanWeight.h
+include/CLucene/search/spans/Spans.h
+include/CLucene/snowball/SnowballAnalyzer.h
+include/CLucene/snowball/SnowballFilter.h
+include/CLucene/snowball/include/libstemmer.h
+include/CLucene/snowball/libstemmer.h
+include/CLucene/snowball/libstemmer/modules.h
+include/CLucene/snowball/runtime/api.h
+include/CLucene/snowball/runtime/header.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_danish.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_english.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_french.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_german.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_italian.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_porter.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.h
+include/CLucene/snowball/src_c/stem_KOI8_R_russian.h
+include/CLucene/snowball/src_c/stem_UTF_8_danish.h
+include/CLucene/snowball/src_c/stem_UTF_8_dutch.h
+include/CLucene/snowball/src_c/stem_UTF_8_english.h
+include/CLucene/snowball/src_c/stem_UTF_8_finnish.h
+include/CLucene/snowball/src_c/stem_UTF_8_french.h
+include/CLucene/snowball/src_c/stem_UTF_8_german.h
+include/CLucene/snowball/src_c/stem_UTF_8_italian.h
+include/CLucene/snowball/src_c/stem_UTF_8_norwegian.h
+include/CLucene/snowball/src_c/stem_UTF_8_porter.h
+include/CLucene/snowball/src_c/stem_UTF_8_portuguese.h
+include/CLucene/snowball/src_c/stem_UTF_8_russian.h
+include/CLucene/snowball/src_c/stem_UTF_8_spanish.h
+include/CLucene/snowball/src_c/stem_UTF_8_swedish.h
 include/CLucene/store/Directory.h
 include/CLucene/store/FSDirectory.h
 include/CLucene/store/IndexInput.h
 include/CLucene/store/IndexOutput.h
-include/CLucene/store/InputStream.h
 include/CLucene/store/Lock.h
-include/CLucene/store/OutputStream.h
+include/CLucene/store/LockFactory.h
 include/CLucene/store/RAMDirectory.h
-include/CLucene/store/TransactionalRAMDirectory.h
-include/CLucene/util/Arrays.h
+include/CLucene/util/Array.h
 include/CLucene/util/BitSet.h
+include/CLucene/util/CLStreams.h
 include/CLucene/util/Equators.h
-include/CLucene/util/FastCharStream.h
-include/CLucene/util/MD5Digester.h
-include/CLucene/util/Misc.h
 include/CLucene/util/PriorityQueue.h
 include/CLucene/util/Reader.h
-include/CLucene/util/StringBuffer.h
-include/CLucene/util/StringIntern.h
-include/CLucene/util/ThreadLocal.h
 include/CLucene/util/VoidList.h
 include/CLucene/util/VoidMap.h
-include/CLucene/util/bufferedstream.h
-include/CLucene/util/dirent.h
-include/CLucene/util/fileinputstream.h
-include/CLucene/util/googlesparsemap.h
-include/CLucene/util/inputstreambuffer.h
-include/CLucene/util/jstreamsconfig.h
-include/CLucene/util/streambase.h
-include/CLucene/util/stringreader.h
-include/CLucene/util/subinputstream.h
-lib/CLucene/clucene-config.h
-lib/libclucene.la
+include/CLucene/util/arrayinputstream.h
+include/CLucene/util/byteinputstream.h
+include/CLucene/util/gzipcompressstream.h
+include/CLucene/util/gzipinputstream.h
+include/CLucene/util/streamarray.h
+lib/CLuceneConfig.cmake/CLuceneConfig.cmake
+lib/libclucene-contribs-lib.so
+lib/libclucene-contribs-lib.so.1
+lib/libclucene-contribs-lib.so.${PKGVERSION}
+lib/libclucene-core.so
+lib/libclucene-core.so.1
+lib/libclucene-core.so.${PKGVERSION}
+lib/libclucene-shared.so
+lib/libclucene-shared.so.1
+lib/libclucene-shared.so.${PKGVERSION}
+lib/pkgconfig/libclucene-core.pc
diff --git a/textproc/libclucene/buildlink3.mk b/textproc/libclucene/buildlink3.mk
index 9d198ccf774..53efbac0ff0 100644
--- a/textproc/libclucene/buildlink3.mk
+++ b/textproc/libclucene/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2013/08/11 16:06:25 jaapb Exp $
 
 BUILDLINK_TREE+=	libclucene
 
 .if !defined(LIBCLUCENE_BUILDLINK3_MK)
 LIBCLUCENE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libclucene+=	libclucene>=0.9.21
+BUILDLINK_API_DEPENDS.libclucene+=	libclucene>=2.2.0
 BUILDLINK_PKGSRCDIR.libclucene?=	../../textproc/libclucene
 .endif # LIBCLUCENE_BUILDLINK3_MK
 
diff --git a/textproc/libclucene/distinfo b/textproc/libclucene/distinfo
index 3af9f2e3e9f..d5b44d69e1f 100644
--- a/textproc/libclucene/distinfo
+++ b/textproc/libclucene/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2013/04/30 22:29:39 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/08/11 16:06:25 jaapb Exp $
 
-SHA1 (clucene-core-0.9.21b.tar.gz) = aba21d626ba3e66a0cce162b205d97cbb2d666dd
-RMD160 (clucene-core-0.9.21b.tar.gz) = b7307b980da6219638f21a33f201b2b20b0d34bb
-Size (clucene-core-0.9.21b.tar.gz) = 1891099 bytes
-SHA1 (patch-src_CLucene_config_repl__tchar.h) = eba4c2fe2a7dadf59490c916bc12557e4f073aa1
-SHA1 (patch-src_CLucene_index_SegmentMerger.cpp) = 8ee2c0e5636690ccff094ee5f869141758bbfcb9
-SHA1 (patch-src_CLucene_search_FieldCacheImpl.cpp) = 8ec21159b9efbee77f7236e5c7d2db0413328154
-SHA1 (patch-src_CLucene_util_Arrays.h) = ef1200cedb394fcefbaccd2b3e71e58e149fddc7
+SHA1 (clucene-core-2.3.3.4.tar.gz) = 76d6788e747e78abb5abf8eaad78d3342da5f2a4
+RMD160 (clucene-core-2.3.3.4.tar.gz) = 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b
+Size (clucene-core-2.3.3.4.tar.gz) = 2241498 bytes
+SHA1 (patch-CMakeLists.txt) = 1c127bdc90a9f7b3c0f3debe46a9681f3b85df9a
+SHA1 (patch-src_contribs-lib_CMakeLists.txt) = c4cf7505474368a7a7b4b826c5d0a7df1cbc2a63
diff --git a/textproc/libclucene/patches/patch-CMakeLists.txt b/textproc/libclucene/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..8a978133334
--- /dev/null
+++ b/textproc/libclucene/patches/patch-CMakeLists.txt
@@ -0,0 +1,33 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2013/08/11 16:06:25 jaapb Exp $
+
+Pkgsrc rewrites CMAKE_MODULE_PATH and it ends up being composed of multiple
+paths. We need to use another variable here or the intended file name will
+be invalid. This software also includes its own versions of Boost and zlib.
+Do not use them.
+Also, if contribs-lib is built, install it.
+--- CMakeLists.txt.orig	2011-03-17 00:21:07.000000000 +0000
++++ CMakeLists.txt
+@@ -153,7 +153,6 @@ GET_BOOST_INCLUDE_PATH(_CL_BOOST_INCLUDE
+ INCLUDE_DIRECTORIES( ${_CL_BOOST_INCLUDE_PATH} )
+ 
+ #include the projects
+-ADD_SUBDIRECTORY (src/ext)
+ ADD_SUBDIRECTORY (src/shared)
+ ADD_SUBDIRECTORY (src/core)
+ ADD_SUBDIRECTORY (src/test)
+@@ -163,13 +162,13 @@ IF ( BUILD_CONTRIBS )
+   SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+-  ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++  ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+ 
+ 
+ #add uninstall command
+ CONFIGURE_FILE(
+-  "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
++  "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+   IMMEDIATE @ONLY)
+   
diff --git a/textproc/libclucene/patches/patch-src_CLucene_config_repl__tchar.h b/textproc/libclucene/patches/patch-src_CLucene_config_repl__tchar.h
deleted file mode 100644
index b7f64700cd3..00000000000
--- a/textproc/libclucene/patches/patch-src_CLucene_config_repl__tchar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_CLucene_config_repl__tchar.h,v 1.1 2013/04/30 22:29:39 joerg Exp $
-
---- src/CLucene/config/repl_tchar.h.orig	2013-04-28 04:24:47.000000000 +0000
-+++ src/CLucene/config/repl_tchar.h
-@@ -33,7 +33,7 @@
-     #define _tcscpy wcscpy //copy a string to another string
-     #define _tcsncpy wcsncpy //copy a specified amount of one string to another string.
-     #define _tcscat wcscat //copy a string onto the end of the other string
--    #define _tcschr wcschr //find location of one character
-+    #define _tcschr ::std::wcschr //find location of one character
-     #define _tcsstr wcsstr //find location of a string
-     #define _tcslen wcslen //get length of a string
-     #define _tcscmp wcscmp //case sensitive compare two strings
diff --git a/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp b/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp
deleted file mode 100644
index 7bf439a1e1c..00000000000
--- a/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_CLucene_index_SegmentMerger.cpp,v 1.1 2012/11/16 01:07:27 joerg Exp $
-
---- src/CLucene/index/SegmentMerger.cpp.orig	2012-11-13 16:35:06.000000000 +0000
-+++ src/CLucene/index/SegmentMerger.cpp
-@@ -249,7 +249,7 @@ int32_t SegmentMerger::mergeFields() {
-     CND_CONDITION(fieldsWriter != NULL,"Memory allocation for fieldsWriter failed");
- 
-     try {  
--        IndexReader* reader = NULL;
-+        reader = NULL;
- 		int32_t maxDoc          = 0;
-         //Iterate through all readers
-         for (uint32_t i = 0; i < readers.size(); i++) {
diff --git a/textproc/libclucene/patches/patch-src_CLucene_search_FieldCacheImpl.cpp b/textproc/libclucene/patches/patch-src_CLucene_search_FieldCacheImpl.cpp
deleted file mode 100644
index d2c5014fdd9..00000000000
--- a/textproc/libclucene/patches/patch-src_CLucene_search_FieldCacheImpl.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_CLucene_search_FieldCacheImpl.cpp,v 1.1 2012/11/16 01:07:27 joerg Exp $
-
---- src/CLucene/search/FieldCacheImpl.cpp.orig	2012-11-13 16:37:37.000000000 +0000
-+++ src/CLucene/search/FieldCacheImpl.cpp
-@@ -414,7 +414,7 @@ FieldCacheImpl::FileEntry::FileEntry (co
- 	  _CLDECDELETE(term);
- 
-       try {
--        Term* term = enumerator->term(false);
-+        term = enumerator->term(false);
-         if (term == NULL) {
-           _CLTHROWA(CL_ERR_Runtime,"no terms in field - cannot determine sort type"); //todo: make rich error: " + field + " 
-         }
diff --git a/textproc/libclucene/patches/patch-src_CLucene_util_Arrays.h b/textproc/libclucene/patches/patch-src_CLucene_util_Arrays.h
deleted file mode 100644
index c59b78ab4ef..00000000000
--- a/textproc/libclucene/patches/patch-src_CLucene_util_Arrays.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_CLucene_util_Arrays.h,v 1.1 2012/11/16 01:07:27 joerg Exp $
-
---- src/CLucene/util/Arrays.h.orig	2012-11-13 16:36:53.000000000 +0000
-+++ src/CLucene/util/Arrays.h
-@@ -151,7 +151,7 @@ CL_NS_DEF(util)
- 
- 			_itr1 itr1 = val1->begin();
- 			_itr2 itr2 = val2->begin();
--			while ( --size >= 0 ){
-+			while ( size-- > 0 ){
- 				if ( !comp(*itr1,*itr2) )
- 					return false;
- 				itr1++;
diff --git a/textproc/libclucene/patches/patch-src_contribs-lib_CMakeLists.txt b/textproc/libclucene/patches/patch-src_contribs-lib_CMakeLists.txt
new file mode 100644
index 00000000000..e992c27c40e
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_contribs-lib_CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_contribs-lib_CMakeLists.txt,v 1.1 2013/08/11 16:06:25 jaapb Exp $
+
+Install contribs-lib if built.
+--- src/contribs-lib/CMakeLists.txt.orig	2011-03-17 00:21:07.000000000 +0000
++++ src/contribs-lib/CMakeLists.txt
+@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+ 
++#install public headers.
++FOREACH(file ${HEADERS})
++	get_filename_component(apath ${file} PATH)
++	get_filename_component(aname ${file} NAME)
++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
++	IF ( NOT aname MATCHES "^_.*" )
++		install(FILES ${file}
++		DESTINATION include/${relpath}
++		COMPONENT development)
++	ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+     VERSION ${CLUCENE_VERSION}
+     SOVERSION ${CLUCENE_SOVERSION}
+     COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib
++	DESTINATION ${LIB_DESTINATION}
++	COMPONENT runtime )