Fri Nov 16 01:07:27 2012 UTC ()
Fix an obvious infinite loop. Don't redefine variables.


(joerg)
diff -r1.6 -r1.7 pkgsrc/textproc/libclucene/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/libclucene/distinfo
diff -r0 -r1.1 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp
diff -r0 -r1.1 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_search_FieldCacheImpl.cpp
diff -r0 -r1.1 pkgsrc/textproc/libclucene/patches/patch-src_CLucene_util_Arrays.h
cvs diff -r1.6 -r1.7 pkgsrc/textproc/libclucene/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libclucene/Makefile 2012/10/25 06:56:02 1.6
+++ pkgsrc/textproc/libclucene/Makefile 2012/11/16 01:07:26 1.7
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:02 asau Exp $ 1# $NetBSD: Makefile,v 1.7 2012/11/16 01:07:26 joerg Exp $
2 2
3DISTNAME= clucene-core-0.9.21b 3DISTNAME= clucene-core-0.9.21b
4PKGNAME= lib${DISTNAME:S/-core-/-/} 4PKGNAME= lib${DISTNAME:S/-core-/-/}
 5PKGREVISION= 1
5CATEGORIES= textproc 6CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clucene/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clucene/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://clucene.sourceforge.net/index.php/Main_Page 10HOMEPAGE= http://clucene.sourceforge.net/index.php/Main_Page
10COMMENT= Text search engine written in C++ 11COMMENT= Text search engine written in C++
11LICENSE= gnu-lgpl-v2.1 OR apache-2.0 12LICENSE= gnu-lgpl-v2.1 OR apache-2.0
12 13
13USE_TOOLS+= gmake 14USE_TOOLS+= gmake
14USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17 18
cvs diff -r1.2 -r1.3 pkgsrc/textproc/libclucene/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libclucene/distinfo 2009/07/23 08:59:54 1.2
+++ pkgsrc/textproc/libclucene/distinfo 2012/11/16 01:07:26 1.3
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.2 2009/07/23 08:59:54 markd Exp $ 1$NetBSD: distinfo,v 1.3 2012/11/16 01:07:26 joerg Exp $
2 2
3SHA1 (clucene-core-0.9.21b.tar.gz) = aba21d626ba3e66a0cce162b205d97cbb2d666dd 3SHA1 (clucene-core-0.9.21b.tar.gz) = aba21d626ba3e66a0cce162b205d97cbb2d666dd
4RMD160 (clucene-core-0.9.21b.tar.gz) = b7307b980da6219638f21a33f201b2b20b0d34bb 4RMD160 (clucene-core-0.9.21b.tar.gz) = b7307b980da6219638f21a33f201b2b20b0d34bb
5Size (clucene-core-0.9.21b.tar.gz) = 1891099 bytes 5Size (clucene-core-0.9.21b.tar.gz) = 1891099 bytes
 6SHA1 (patch-src_CLucene_index_SegmentMerger.cpp) = 8ee2c0e5636690ccff094ee5f869141758bbfcb9
 7SHA1 (patch-src_CLucene_search_FieldCacheImpl.cpp) = 8ec21159b9efbee77f7236e5c7d2db0413328154
 8SHA1 (patch-src_CLucene_util_Arrays.h) = ef1200cedb394fcefbaccd2b3e71e58e149fddc7
File Added: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_index_SegmentMerger.cpp
$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++) {
File Added: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_search_FieldCacheImpl.cpp
$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 + " 
         }
File Added: pkgsrc/textproc/libclucene/patches/Attic/patch-src_CLucene_util_Arrays.h
$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++;