Sun Aug 11 16:06:25 2013 UTC ()
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.


(jaapb)
diff -r1.7 -r1.8 pkgsrc/textproc/libclucene/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/libclucene/PLIST
diff -r1.2 -r1.3 pkgsrc/textproc/libclucene/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/textproc/libclucene/distinfo
diff -r0 -r1.1 pkgsrc/textproc/libclucene/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/textproc/libclucene/patches/patch-src_contribs-lib_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_config_repl__tchar.h
diff -r1.1 -r0 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp
diff -r1.1 -r0 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_search_FieldCacheImpl.cpp
diff -r1.1 -r0 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_util_Arrays.h

cvs diff -r1.7 -r1.8 pkgsrc/textproc/libclucene/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libclucene/Makefile 2012/11/16 01:07:26 1.7
+++ pkgsrc/textproc/libclucene/Makefile 2013/08/11 16:06:25 1.8
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: Makefile,v 1.7 2012/11/16 01:07:26 joerg Exp $ 1# $NetBSD: Makefile,v 1.8 2013/08/11 16:06:25 jaapb Exp $
2 2
3DISTNAME= clucene-core-0.9.21b 3DISTNAME= clucene-core-2.3.3.4
4PKGNAME= lib${DISTNAME:S/-core-/-/} 4PKGNAME= lib${DISTNAME:S/-core-/-/}
5PKGREVISION= 1 
6CATEGORIES= textproc 5CATEGORIES= textproc
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clucene/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clucene/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://clucene.sourceforge.net/index.php/Main_Page 9HOMEPAGE= http://clucene.sourceforge.net/index.php/Main_Page
11COMMENT= Text search engine written in C++ 10COMMENT= Text search engine written in C++
12LICENSE= gnu-lgpl-v2.1 OR apache-2.0 11LICENSE= gnu-lgpl-v2.1 OR apache-2.0
13 12
14USE_TOOLS+= gmake 13PKGCONFIG_OVERRIDE+= libclucene-core.pc.in
 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16GNU_CONFIGURE= yes 16USE_CMAKE= yes
 17CMAKE_ARGS+= -DBUILD_CONTRIBS_LIB=ON
 18#BUILD_TARGET+= clucene-contribs-lib
17USE_LIBTOOL= yes 19USE_LIBTOOL= yes
18 20
 21.include "../../devel/boost-libs/buildlink3.mk"
 22
19.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/textproc/libclucene/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libclucene/PLIST 2009/06/14 18:17:21 1.2
+++ pkgsrc/textproc/libclucene/PLIST 2013/08/11 16:06:25 1.3
@@ -1,132 +1,179 @@ @@ -1,132 +1,179 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:21 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2013/08/11 16:06:25 jaapb Exp $
2include/CLucene.h 2include/CLucene.h
3include/CLucene/CLBackwards.h 
4include/CLucene/CLConfig.h 3include/CLucene/CLConfig.h
 4include/CLucene/CLuceneConfig.cmake
5include/CLucene/LuceneThreads.h 5include/CLucene/LuceneThreads.h
 6include/CLucene/SharedHeader.h
6include/CLucene/StdHeader.h 7include/CLucene/StdHeader.h
7include/CLucene/analysis/AnalysisHeader.h 8include/CLucene/analysis/AnalysisHeader.h
8include/CLucene/analysis/Analyzers.h 9include/CLucene/analysis/Analyzers.h
 10include/CLucene/analysis/CachingTokenFilter.h
 11include/CLucene/analysis/LanguageBasedAnalyzer.h
 12include/CLucene/analysis/PorterStemmer.h
 13include/CLucene/analysis/cjk/CJKAnalyzer.h
 14include/CLucene/analysis/de/GermanAnalyzer.h
 15include/CLucene/analysis/de/GermanStemFilter.h
 16include/CLucene/analysis/de/GermanStemmer.h
9include/CLucene/analysis/standard/StandardAnalyzer.h 17include/CLucene/analysis/standard/StandardAnalyzer.h
10include/CLucene/analysis/standard/StandardFilter.h 18include/CLucene/analysis/standard/StandardFilter.h
11include/CLucene/analysis/standard/StandardTokenizer.h 19include/CLucene/analysis/standard/StandardTokenizer.h
12include/CLucene/analysis/standard/StandardTokenizerConstants.h 20include/CLucene/analysis/standard/StandardTokenizerConstants.h
13include/CLucene/config/CompilerBcb.h 21include/CLucene/clucene-config.h
14include/CLucene/config/CompilerGcc.h 
15include/CLucene/config/CompilerMsvc.h 
16include/CLucene/config/PlatformMac.h 
17include/CLucene/config/PlatformUnix.h 
18include/CLucene/config/PlatformWin32.h 
19include/CLucene/config/compiler.h 
20include/CLucene/config/define_std.h 
21include/CLucene/config/gunichartables.h 
22include/CLucene/config/repl_tchar.h 
23include/CLucene/config/repl_wchar.h 
24include/CLucene/config/threadCSection.h 
25include/CLucene/config/threadPthread.h 
26include/CLucene/debug/condition.h 
27include/CLucene/debug/error.h 22include/CLucene/debug/error.h
28include/CLucene/debug/lucenebase.h 23include/CLucene/debug/lucenebase.h
29include/CLucene/debug/mem.h 24include/CLucene/debug/mem.h
30include/CLucene/document/DateField.h 25include/CLucene/document/DateField.h
 26include/CLucene/document/DateTools.h
31include/CLucene/document/Document.h 27include/CLucene/document/Document.h
32include/CLucene/document/Field.h 28include/CLucene/document/Field.h
33include/CLucene/index/CompoundFile.h 29include/CLucene/document/FieldSelector.h
34include/CLucene/index/DocumentWriter.h 30include/CLucene/document/NumberTools.h
35include/CLucene/index/FieldInfo.h 31include/CLucene/highlighter/Encoder.h
36include/CLucene/index/FieldInfos.h 32include/CLucene/highlighter/Formatter.h
37include/CLucene/index/FieldsReader.h 33include/CLucene/highlighter/Fragmenter.h
38include/CLucene/index/FieldsWriter.h 34include/CLucene/highlighter/HighlightScorer.h
 35include/CLucene/highlighter/Highlighter.h
 36include/CLucene/highlighter/QueryScorer.h
 37include/CLucene/highlighter/QueryTermExtractor.h
 38include/CLucene/highlighter/Scorer.h
 39include/CLucene/highlighter/SimpleFragmenter.h
 40include/CLucene/highlighter/SimpleHTMLEncoder.h
 41include/CLucene/highlighter/SimpleHTMLFormatter.h
 42include/CLucene/highlighter/TextFragment.h
 43include/CLucene/highlighter/TokenGroup.h
 44include/CLucene/highlighter/TokenSources.h
 45include/CLucene/highlighter/WeightedTerm.h
 46include/CLucene/index/DirectoryIndexReader.h
 47include/CLucene/index/IndexDeletionPolicy.h
39include/CLucene/index/IndexModifier.h 48include/CLucene/index/IndexModifier.h
40include/CLucene/index/IndexReader.h 49include/CLucene/index/IndexReader.h
41include/CLucene/index/IndexWriter.h 50include/CLucene/index/IndexWriter.h
 51include/CLucene/index/MergePolicy.h
 52include/CLucene/index/MergeScheduler.h
42include/CLucene/index/MultiReader.h 53include/CLucene/index/MultiReader.h
43include/CLucene/index/SegmentHeader.h 54include/CLucene/index/MultipleTermPositions.h
44include/CLucene/index/SegmentInfos.h 55include/CLucene/index/Payload.h
45include/CLucene/index/SegmentMergeInfo.h 
46include/CLucene/index/SegmentMergeQueue.h 
47include/CLucene/index/SegmentMerger.h 
48include/CLucene/index/SegmentTermEnum.h 
49include/CLucene/index/Term.h 56include/CLucene/index/Term.h
50include/CLucene/index/TermInfo.h 
51include/CLucene/index/TermInfosReader.h 
52include/CLucene/index/TermInfosWriter.h 
53include/CLucene/index/TermVector.h 57include/CLucene/index/TermVector.h
54include/CLucene/index/Terms.h 58include/CLucene/index/Terms.h
55include/CLucene/queryParser/Lexer.h 
56include/CLucene/queryParser/MultiFieldQueryParser.h 59include/CLucene/queryParser/MultiFieldQueryParser.h
57include/CLucene/queryParser/QueryParser.h 60include/CLucene/queryParser/QueryParser.h
58include/CLucene/queryParser/QueryParserBase.h 61include/CLucene/queryParser/QueryParserConstants.h
 62include/CLucene/queryParser/QueryParserTokenManager.h
59include/CLucene/queryParser/QueryToken.h 63include/CLucene/queryParser/QueryToken.h
60include/CLucene/queryParser/TokenList.h 64include/CLucene/queryParser/legacy/MultiFieldQueryParser.h
 65include/CLucene/queryParser/legacy/QueryParser.h
 66include/CLucene/queryParser/legacy/QueryToken.h
61include/CLucene/search/BooleanClause.h 67include/CLucene/search/BooleanClause.h
62include/CLucene/search/BooleanQuery.h 68include/CLucene/search/BooleanQuery.h
63include/CLucene/search/BooleanScorer.h 69include/CLucene/search/CachingSpanFilter.h
64include/CLucene/search/CachingWrapperFilter.h 70include/CLucene/search/CachingWrapperFilter.h
65include/CLucene/search/ChainedFilter.h 71include/CLucene/search/ChainedFilter.h
66include/CLucene/search/Compare.h 72include/CLucene/search/Compare.h
67include/CLucene/search/ConjunctionScorer.h 73include/CLucene/search/ConstantScoreQuery.h
68include/CLucene/search/DateFilter.h 74include/CLucene/search/DateFilter.h
69include/CLucene/search/ExactPhraseScorer.h 
70include/CLucene/search/Explanation.h 75include/CLucene/search/Explanation.h
71include/CLucene/search/FieldCache.h 76include/CLucene/search/FieldCache.h
72include/CLucene/search/FieldCacheImpl.h 
73include/CLucene/search/FieldDoc.h 77include/CLucene/search/FieldDoc.h
74include/CLucene/search/FieldDocSortedHitQueue.h 
75include/CLucene/search/FieldSortedHitQueue.h 78include/CLucene/search/FieldSortedHitQueue.h
76include/CLucene/search/Filter.h 79include/CLucene/search/Filter.h
 80include/CLucene/search/FilterResultCache.h
77include/CLucene/search/FilteredTermEnum.h 81include/CLucene/search/FilteredTermEnum.h
78include/CLucene/search/FuzzyQuery.h 82include/CLucene/search/FuzzyQuery.h
79include/CLucene/search/HitQueue.h 83include/CLucene/search/Hits.h
80include/CLucene/search/IndexSearcher.h 84include/CLucene/search/IndexSearcher.h
 85include/CLucene/search/MatchAllDocsQuery.h
 86include/CLucene/search/MultiPhraseQuery.h
81include/CLucene/search/MultiSearcher.h 87include/CLucene/search/MultiSearcher.h
82include/CLucene/search/MultiTermQuery.h 88include/CLucene/search/MultiTermQuery.h
83include/CLucene/search/PhrasePositions.h 
84include/CLucene/search/PhraseQuery.h 89include/CLucene/search/PhraseQuery.h
85include/CLucene/search/PhraseQueue.h 
86include/CLucene/search/PhraseScorer.h 
87include/CLucene/search/PrefixQuery.h 90include/CLucene/search/PrefixQuery.h
 91include/CLucene/search/Query.h
88include/CLucene/search/QueryFilter.h 92include/CLucene/search/QueryFilter.h
89include/CLucene/search/RangeFilter.h 93include/CLucene/search/RangeFilter.h
90include/CLucene/search/RangeQuery.h 94include/CLucene/search/RangeQuery.h
91include/CLucene/search/Scorer.h 95include/CLucene/search/Scorer.h
 96include/CLucene/search/ScorerDocQueue.h
92include/CLucene/search/SearchHeader.h 97include/CLucene/search/SearchHeader.h
 98include/CLucene/search/Searchable.h
93include/CLucene/search/Similarity.h 99include/CLucene/search/Similarity.h
94include/CLucene/search/SloppyPhraseScorer.h 
95include/CLucene/search/Sort.h 100include/CLucene/search/Sort.h
 101include/CLucene/search/SpanFilter.h
 102include/CLucene/search/SpanFilterResult.h
 103include/CLucene/search/SpanQueryFilter.h
96include/CLucene/search/TermQuery.h 104include/CLucene/search/TermQuery.h
97include/CLucene/search/TermScorer.h 
98include/CLucene/search/WildcardQuery.h 105include/CLucene/search/WildcardQuery.h
99include/CLucene/search/WildcardTermEnum.h 106include/CLucene/search/WildcardTermEnum.h
 107include/CLucene/search/spans/SpanFirstQuery.h
 108include/CLucene/search/spans/SpanNearQuery.h
 109include/CLucene/search/spans/SpanNotQuery.h
 110include/CLucene/search/spans/SpanOrQuery.h
 111include/CLucene/search/spans/SpanQuery.h
 112include/CLucene/search/spans/SpanScorer.h
 113include/CLucene/search/spans/SpanTermQuery.h
 114include/CLucene/search/spans/SpanWeight.h
 115include/CLucene/search/spans/Spans.h
 116include/CLucene/snowball/SnowballAnalyzer.h
 117include/CLucene/snowball/SnowballFilter.h
 118include/CLucene/snowball/include/libstemmer.h
 119include/CLucene/snowball/libstemmer.h
 120include/CLucene/snowball/libstemmer/modules.h
 121include/CLucene/snowball/runtime/api.h
 122include/CLucene/snowball/runtime/header.h
 123include/CLucene/snowball/src_c/stem_ISO_8859_1_danish.h
 124include/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.h
 125include/CLucene/snowball/src_c/stem_ISO_8859_1_english.h
 126include/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.h
 127include/CLucene/snowball/src_c/stem_ISO_8859_1_french.h
 128include/CLucene/snowball/src_c/stem_ISO_8859_1_german.h
 129include/CLucene/snowball/src_c/stem_ISO_8859_1_italian.h
 130include/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.h
 131include/CLucene/snowball/src_c/stem_ISO_8859_1_porter.h
 132include/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.h
 133include/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.h
 134include/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.h
 135include/CLucene/snowball/src_c/stem_KOI8_R_russian.h
 136include/CLucene/snowball/src_c/stem_UTF_8_danish.h
 137include/CLucene/snowball/src_c/stem_UTF_8_dutch.h
 138include/CLucene/snowball/src_c/stem_UTF_8_english.h
 139include/CLucene/snowball/src_c/stem_UTF_8_finnish.h
 140include/CLucene/snowball/src_c/stem_UTF_8_french.h
 141include/CLucene/snowball/src_c/stem_UTF_8_german.h
 142include/CLucene/snowball/src_c/stem_UTF_8_italian.h
 143include/CLucene/snowball/src_c/stem_UTF_8_norwegian.h
 144include/CLucene/snowball/src_c/stem_UTF_8_porter.h
 145include/CLucene/snowball/src_c/stem_UTF_8_portuguese.h
 146include/CLucene/snowball/src_c/stem_UTF_8_russian.h
 147include/CLucene/snowball/src_c/stem_UTF_8_spanish.h
 148include/CLucene/snowball/src_c/stem_UTF_8_swedish.h
100include/CLucene/store/Directory.h 149include/CLucene/store/Directory.h
101include/CLucene/store/FSDirectory.h 150include/CLucene/store/FSDirectory.h
102include/CLucene/store/IndexInput.h 151include/CLucene/store/IndexInput.h
103include/CLucene/store/IndexOutput.h 152include/CLucene/store/IndexOutput.h
104include/CLucene/store/InputStream.h 
105include/CLucene/store/Lock.h 153include/CLucene/store/Lock.h
106include/CLucene/store/OutputStream.h 154include/CLucene/store/LockFactory.h
107include/CLucene/store/RAMDirectory.h 155include/CLucene/store/RAMDirectory.h
108include/CLucene/store/TransactionalRAMDirectory.h 156include/CLucene/util/Array.h
109include/CLucene/util/Arrays.h 
110include/CLucene/util/BitSet.h 157include/CLucene/util/BitSet.h
 158include/CLucene/util/CLStreams.h
111include/CLucene/util/Equators.h 159include/CLucene/util/Equators.h
112include/CLucene/util/FastCharStream.h 
113include/CLucene/util/MD5Digester.h 
114include/CLucene/util/Misc.h 
115include/CLucene/util/PriorityQueue.h 160include/CLucene/util/PriorityQueue.h
116include/CLucene/util/Reader.h 161include/CLucene/util/Reader.h
117include/CLucene/util/StringBuffer.h 
118include/CLucene/util/StringIntern.h 
119include/CLucene/util/ThreadLocal.h 
120include/CLucene/util/VoidList.h 162include/CLucene/util/VoidList.h
121include/CLucene/util/VoidMap.h 163include/CLucene/util/VoidMap.h
122include/CLucene/util/bufferedstream.h 164include/CLucene/util/arrayinputstream.h
123include/CLucene/util/dirent.h 165include/CLucene/util/byteinputstream.h
124include/CLucene/util/fileinputstream.h 166include/CLucene/util/gzipcompressstream.h
125include/CLucene/util/googlesparsemap.h 167include/CLucene/util/gzipinputstream.h
126include/CLucene/util/inputstreambuffer.h 168include/CLucene/util/streamarray.h
127include/CLucene/util/jstreamsconfig.h 169lib/CLuceneConfig.cmake/CLuceneConfig.cmake
128include/CLucene/util/streambase.h 170lib/libclucene-contribs-lib.so
129include/CLucene/util/stringreader.h 171lib/libclucene-contribs-lib.so.1
130include/CLucene/util/subinputstream.h 172lib/libclucene-contribs-lib.so.${PKGVERSION}
131lib/CLucene/clucene-config.h 173lib/libclucene-core.so
132lib/libclucene.la 174lib/libclucene-core.so.1
 175lib/libclucene-core.so.${PKGVERSION}
 176lib/libclucene-shared.so
 177lib/libclucene-shared.so.1
 178lib/libclucene-shared.so.${PKGVERSION}
 179lib/pkgconfig/libclucene-core.pc

cvs diff -r1.2 -r1.3 pkgsrc/textproc/libclucene/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/libclucene/buildlink3.mk 2009/03/20 19:25:30 1.2
+++ pkgsrc/textproc/libclucene/buildlink3.mk 2013/08/11 16:06:25 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2013/08/11 16:06:25 jaapb Exp $
2 2
3BUILDLINK_TREE+= libclucene 3BUILDLINK_TREE+= libclucene
4 4
5.if !defined(LIBCLUCENE_BUILDLINK3_MK) 5.if !defined(LIBCLUCENE_BUILDLINK3_MK)
6LIBCLUCENE_BUILDLINK3_MK:= 6LIBCLUCENE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libclucene+= libclucene>=0.9.21 8BUILDLINK_API_DEPENDS.libclucene+= libclucene>=2.2.0
9BUILDLINK_PKGSRCDIR.libclucene?= ../../textproc/libclucene 9BUILDLINK_PKGSRCDIR.libclucene?= ../../textproc/libclucene
10.endif # LIBCLUCENE_BUILDLINK3_MK 10.endif # LIBCLUCENE_BUILDLINK3_MK
11 11
12BUILDLINK_TREE+= -libclucene 12BUILDLINK_TREE+= -libclucene

cvs diff -r1.4 -r1.5 pkgsrc/textproc/libclucene/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libclucene/distinfo 2013/04/30 22:29:39 1.4
+++ pkgsrc/textproc/libclucene/distinfo 2013/08/11 16:06:25 1.5
@@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
1$NetBSD: distinfo,v 1.4 2013/04/30 22:29:39 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2013/08/11 16:06:25 jaapb Exp $
2 2
3SHA1 (clucene-core-0.9.21b.tar.gz) = aba21d626ba3e66a0cce162b205d97cbb2d666dd 3SHA1 (clucene-core-2.3.3.4.tar.gz) = 76d6788e747e78abb5abf8eaad78d3342da5f2a4
4RMD160 (clucene-core-0.9.21b.tar.gz) = b7307b980da6219638f21a33f201b2b20b0d34bb 4RMD160 (clucene-core-2.3.3.4.tar.gz) = 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b
5Size (clucene-core-0.9.21b.tar.gz) = 1891099 bytes 5Size (clucene-core-2.3.3.4.tar.gz) = 2241498 bytes
6SHA1 (patch-src_CLucene_config_repl__tchar.h) = eba4c2fe2a7dadf59490c916bc12557e4f073aa1 6SHA1 (patch-CMakeLists.txt) = 1c127bdc90a9f7b3c0f3debe46a9681f3b85df9a
7SHA1 (patch-src_CLucene_index_SegmentMerger.cpp) = 8ee2c0e5636690ccff094ee5f869141758bbfcb9 7SHA1 (patch-src_contribs-lib_CMakeLists.txt) = c4cf7505474368a7a7b4b826c5d0a7df1cbc2a63
8SHA1 (patch-src_CLucene_search_FieldCacheImpl.cpp) = 8ec21159b9efbee77f7236e5c7d2db0413328154 
9SHA1 (patch-src_CLucene_util_Arrays.h) = ef1200cedb394fcefbaccd2b3e71e58e149fddc7 

File Added: pkgsrc/textproc/libclucene/patches/patch-CMakeLists.txt
$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)
   

File Added: pkgsrc/textproc/libclucene/patches/patch-src_contribs-lib_CMakeLists.txt
$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 )

File Deleted: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_config_repl__tchar.h

File Deleted: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_index_SegmentMerger.cpp

File Deleted: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_search_FieldCacheImpl.cpp

File Deleted: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_util_Arrays.h