Re: pkg/46156: Update textproc/libclucene to version 2.3.3.4

[Francois Tigeot <ftigeot%wolfpond.org@localhost>]

The following reply was made to PR pkg/46156; it has been noted by GNATS.

From: Francois Tigeot <ftigeot%wolfpond.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: ftigeot%wolfpond.org@localhost
Subject: Re: pkg/46156: Update textproc/libclucene to version 2.3.3.4
Date: Thu, 8 Mar 2012 23:59:51 +0100

 --HlL+5n6rz5pIUxbD
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Thu, Mar 08, 2012 at 10:50:01PM +0000, gnats-admin%NetBSD.org@localhost 
wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `pkg/46156'.
 
 1. Apply patch-update-liblucene.txt to textproc/libclucene
 
 2. Add  patch-CMakeLists.txt to its patches/ subdirectory
 
 -- 
 Francois Tigeot
 
 --HlL+5n6rz5pIUxbD
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch-CMakeLists.txt"
 
 $NetBSD$
 
 Pkgsrc rewrites CMAKE_MODULE_PATH and it ends up beeing 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.
 
 --- 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)
 @@ -169,7 +168,7 @@ 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)
    
 
 --HlL+5n6rz5pIUxbD
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch-update-liblucene.txt"
 
 ? patch-update-liblucene.txt
 ? patches
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/textproc/libclucene/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 --- Makefile   23 Jul 2009 08:59:54 -0000      1.3
 +++ Makefile   8 Mar 2012 22:52:15 -0000
 @@ -1,6 +1,6 @@
  # $NetBSD: Makefile,v 1.3 2009/07/23 08:59:54 markd Exp $
  
 -DISTNAME=             clucene-core-0.9.21b
 +DISTNAME=             clucene-core-2.3.3.4
  PKGNAME=              lib${DISTNAME:S/-core-/-/}
  CATEGORIES=           textproc
  MASTER_SITES=         ${MASTER_SITE_SOURCEFORGE:=clucene/}
 @@ -12,9 +12,12 @@
  
  PKG_DESTDIR_SUPPORT=  user-destdir
  
 -USE_TOOLS+=           gmake
 +PKGCONFIG_OVERRIDE+=  libclucene-core.pc.in
 +
  USE_LANGUAGES=                c c++
 -GNU_CONFIGURE=                yes
 +USE_CMAKE=            yes
  USE_LIBTOOL=          yes
  
 +.include "../../devel/boost-libs/buildlink3.mk"
 +
  .include "../../mk/bsd.pkg.mk"
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/textproc/libclucene/PLIST,v
 retrieving revision 1.2
 diff -u -r1.2 PLIST
 --- PLIST      14 Jun 2009 18:17:21 -0000      1.2
 +++ PLIST      8 Mar 2012 22:52:15 -0000
 @@ -1,132 +1,117 @@
 -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:21 joerg Exp $
 +@comment $NetBSD$
  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/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/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/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
 +lib/CLuceneConfig.cmake/CLuceneConfig.cmake
 +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.${LOWER_VENDOR}
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/textproc/libclucene/distinfo,v
 retrieving revision 1.2
 diff -u -r1.2 distinfo
 --- distinfo   23 Jul 2009 08:59:54 -0000      1.2
 +++ distinfo   8 Mar 2012 22:52:15 -0000
 @@ -1,5 +1,6 @@
  $NetBSD: distinfo,v 1.2 2009/07/23 08:59:54 markd 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 (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) = ddfbc6b72ec2efcb10c7a160888bfae3dda4e70a
 
 --HlL+5n6rz5pIUxbD--