Fix an obvious infinite loop. Don't redefine variables.

5 files changed, 45 insertions, 2 deletions

diff --git a/textproc/libclucene/Makefile b/textproc/libclucene/Makefile
index 41dd53fc4a8..e6ceef98598 100644
--- a/textproc/libclucene/Makefile
+++ b/textproc/libclucene/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:02 asau Exp $
+# $NetBSD: Makefile,v 1.7 2012/11/16 01:07:26 joerg Exp $
 
 DISTNAME=		clucene-core-0.9.21b
 PKGNAME=		lib${DISTNAME:S/-core-/-/}
+PKGREVISION=		1
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clucene/}
 
diff --git a/textproc/libclucene/distinfo b/textproc/libclucene/distinfo
index 29ac9f6e07d..2ce80d32fd6 100644
--- a/textproc/libclucene/distinfo
+++ b/textproc/libclucene/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/07/23 08:59:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/11/16 01:07:26 joerg 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_index_SegmentMerger.cpp) = 8ee2c0e5636690ccff094ee5f869141758bbfcb9
+SHA1 (patch-src_CLucene_search_FieldCacheImpl.cpp) = 8ec21159b9efbee77f7236e5c7d2db0413328154
+SHA1 (patch-src_CLucene_util_Arrays.h) = ef1200cedb394fcefbaccd2b3e71e58e149fddc7
diff --git a/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp b/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp
new file mode 100644
index 00000000000..7bf439a1e1c
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_CLucene_index_SegmentMerger.cpp
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..d2c5014fdd9
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_CLucene_search_FieldCacheImpl.cpp
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..c59b78ab4ef
--- /dev/null
+++ b/textproc/libclucene/patches/patch-src_CLucene_util_Arrays.h
@@ -0,0 +1,13 @@
+$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++;