- Re-assign textproc/clucene maintainship to office@. [1]

- Update textproc/clucene to 2.3.3.4.  Note this version is required by
recent LibreOffice.
- Remove textproc/clucene-contrib because it is now integrated into
textproc/clucene. [2]
- Mark textproc/p5-Lucene as broken.  There is no dependent port and it was
only written for obsolete Lucene 0.9.x API. [3]
- Update deskutils/kdepim4 and deskutils/strigi to build with the new
CLucene port. [4]
- Update misc/bibletime and misc/sword to use new CLucene 2.3.x API. [5]

Approved by:	clsung (maintainer timeout) [1]
Approved by:	tj (maintainer) [2]
Approved by:	perl [3]
Approved by:	kde [4]
Approved by:	tabthorpe (maintainer timeout) [5]
Obtained from:	The SWORD Project [5]

7 files changed, 120 insertions, 0 deletions

diff --git a/textproc/clucene/files/patch-CMakeLists.txt b/textproc/clucene/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..397c374d661a
--- /dev/null
+++ b/textproc/clucene/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2011-03-16 20:21:07.000000000 -0400
++++ CMakeLists.txt	2012-08-07 16:27:55.000000000 -0400
+@@ -163,7 +163,7 @@
+   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 )
+ 
+ 
diff --git a/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp b/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp
new file mode 100644
index 000000000000..96e809856cdd
--- /dev/null
+++ b/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp
@@ -0,0 +1,11 @@
+--- src/contribs-lib/CLucene/analysis/de/GermanStemmer.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/contribs-lib/CLucene/analysis/de/GermanStemmer.cpp	2013-01-08 17:03:27.000000000 -0500
+@@ -144,7 +144,7 @@
+           {
+             buffer.setCharAt( i, _T('$') );
+             buffer.deleteChars( i + 1, i + 3 );
+-            substCount =+ 2;
++            substCount += 2;
+           }
+           else if ( c == _T('c') && buffer.charAt( i + 1 ) == _T('h') ) {
+             buffer.setCharAt( i, 0xa7 ); // section sign in UTF-16
diff --git a/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt b/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt
new file mode 100644
index 000000000000..69e598bb5179
--- /dev/null
+++ b/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt
@@ -0,0 +1,29 @@
+--- src/contribs-lib/CMakeLists.txt.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/contribs-lib/CMakeLists.txt	2012-08-07 16:27:55.000000000 -0400
+@@ -106,9 +106,26 @@
+ )
+ 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 )
diff --git a/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp b/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
new file mode 100644
index 000000000000..88106f694fc4
--- /dev/null
+++ b/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
@@ -0,0 +1,11 @@
+--- src/core/CLucene/index/DocumentsWriter.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/index/DocumentsWriter.cpp	2012-08-07 17:23:51.000000000 -0400
+@@ -125,7 +125,7 @@
+   if (this->postingsFreeListDW.values){
+       if (this->postingsFreeCountDW < this->postingsFreeListDW.length) {
+           memset(this->postingsFreeListDW.values + this->postingsFreeCountDW
+-              , NULL
++              , 0
+               , sizeof(Posting*));
+       }
+       postingsFreeListDW.deleteUntilNULL();
diff --git a/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h b/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
new file mode 100644
index 000000000000..bb5492e0874b
--- /dev/null
+++ b/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
@@ -0,0 +1,19 @@
+--- src/core/CLucene/util/VoidMap.h.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/util/VoidMap.h	2013-01-08 17:37:43.000000000 -0500
+@@ -83,7 +83,7 @@
+ 	_vt get( _kt k) const {
+ 		const_iterator itr = base::find(k);
+ 		if ( itr==base::end() )
+-			return (_vt)NULL;
++			return static_cast<_vt>(0);
+ 		else
+ 			return itr->second;
+ 	}
+@@ -316,6 +316,7 @@
+ 		if ( _this::dk || _this::dv )
+ 			_this::remove(k);
+ 
++		(*this)[k] = v;;
+ 	}
+ };
+ 
diff --git a/textproc/clucene/files/patch-src__core__CMakeLists.txt b/textproc/clucene/files/patch-src__core__CMakeLists.txt
new file mode 100644
index 000000000000..b38690d1ad38
--- /dev/null
+++ b/textproc/clucene/files/patch-src__core__CMakeLists.txt
@@ -0,0 +1,28 @@
+--- src/core/CMakeLists.txt.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CMakeLists.txt	2012-08-07 14:12:31.000000000 -0400
+@@ -252,13 +252,13 @@
+     set(CLUCENE_SOVERSION ${CLUCENE_SOVERSION})
+ ")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
+-        DESTINATION ${LIB_DESTINATION}/CLuceneConfig.cmake)
++        DESTINATION ${LIB_DESTINATION}/CLucene)
+ 
+ # install pkg-config file
+ IF(NOT WIN32)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libclucene-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc @ONLY)
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc
+-          DESTINATION ${LIB_DESTINATION}/pkgconfig )
++          DESTINATION libdata/pkgconfig )
+ ENDIF(NOT WIN32)
+ 
+ 
+@@ -274,9 +274,6 @@
+     install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
+             DESTINATION include/CLucene
+             COMPONENT development)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake 
+-            DESTINATION include/CLucene
+-            COMPONENT development)
+ ENDIF ( LUCENE_SYS_INCLUDES )
+ 
+ 
diff --git a/textproc/clucene/files/patch-src__shared__CMakeLists.txt b/textproc/clucene/files/patch-src__shared__CMakeLists.txt
new file mode 100644
index 000000000000..7bd76230e642
--- /dev/null
+++ b/textproc/clucene/files/patch-src__shared__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/shared/CMakeLists.txt.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/shared/CMakeLists.txt	2012-08-07 13:31:00.000000000 -0400
+@@ -62,7 +62,7 @@
+                         stdint.h unistd.h io.h direct.h sys/dir.h sys/ndir.h dirent.h wctype.h fcntl.h
+                         stat.h sys/stat.h stdexcept errno.h fcntl.h windef.h windows.h wchar.h 
+                         hash_map hash_set ext/hash_map ext/hash_map tr1/unordered_set tr1/unordered_map
+-                        sys/timeb.h tchar.h strings.h stdexcept sys/mman.h winerror.h )
++                        tchar.h strings.h stdexcept sys/mman.h winerror.h )
+ 
+ 
+ ########################################################################