svn commit: r311137 - in head: . deskutils/kdepim4 deskutils/strigi misc/bibletime misc/sword misc/sword/files textproc textproc/clucene textproc/clucene-contrib textproc/clucene/files textproc/p5-...

Jung-uk Kim jkim at FreeBSD.org
Mon Jan 28 22:25:10 UTC 2013 

Author: jkim
Date: Mon Jan 28 22:25:05 2013
New Revision: 311137
URL: http://svnweb.freebsd.org/changeset/ports/311137

Log:
  - Re-assign textproc/clucene maintainship to office at . [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]

Added:
  head/misc/sword/files/patch-configure   (contents, props changed)
  head/misc/sword/files/patch-src__modules__swmodule.cpp   (contents, props changed)
  head/textproc/clucene/files/
  head/textproc/clucene/files/patch-CMakeLists.txt   (contents, props changed)
  head/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp   (contents, props changed)
  head/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt   (contents, props changed)
  head/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp   (contents, props changed)
  head/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h   (contents, props changed)
  head/textproc/clucene/files/patch-src__core__CMakeLists.txt   (contents, props changed)
  head/textproc/clucene/files/patch-src__shared__CMakeLists.txt   (contents, props changed)
Deleted:
  head/textproc/clucene-contrib/
Modified:
  head/MOVED
  head/deskutils/kdepim4/Makefile
  head/deskutils/strigi/Makefile
  head/deskutils/strigi/pkg-plist
  head/misc/bibletime/Makefile
  head/misc/sword/Makefile
  head/textproc/Makefile
  head/textproc/clucene/Makefile   (contents, props changed)
  head/textproc/clucene/distinfo   (contents, props changed)
  head/textproc/clucene/pkg-plist   (contents, props changed)
  head/textproc/p5-Lucene/Makefile
Directory Properties:
  head/misc/sword/files/patch-include::ftpparse.h   (props changed)
  head/misc/sword/files/patch-src::utilfuns::ftpparse.c   (props changed)
  head/misc/sword/files/patch-src__mgr__curlftpt.cpp   (props changed)
  head/misc/sword/files/pkg-message.in   (props changed)
  head/textproc/clucene/pkg-descr   (props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/MOVED	Mon Jan 28 22:25:05 2013	(r311137)
@@ -4015,3 +4015,4 @@ x11-toolkits/fltk11||2013-01-27|Has expi
 sysutils/salt|sysutils/py-salt|2013-01-27|Rename to consistency with other Python ports
 sysutils/salt-cloud|sysutils/py-salt-cloud|2013-01-27|Rename to consistency with other Python ports
 deskutils/py-dosage|deskutils/dosage|2013-01-28|Rename - it's a standalone application
+textproc/clucene-contrib|textproc/clucene|2013-01-28|Integrated into textproc/clucene

Modified: head/deskutils/kdepim4/Makefile
==============================================================================
--- head/deskutils/kdepim4/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/deskutils/kdepim4/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,12 +1,9 @@
-# New ports collection Makefile for:	kdepimp4
-# Date created:				2008-31-05
-# Whom:					miwi
-#
+# Created by: Martin Wilke <miwi at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -20,7 +17,7 @@ LIB_DEPENDS=	gpgme.19:${PORTSDIR}/securi
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		grantlee_gui.0:${PORTSDIR}/devel/grantlee \
-		clucene.0:${PORTSDIR}/textproc/clucene
+		clucene-core:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime
 

Modified: head/deskutils/strigi/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/deskutils/strigi/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,12 +1,9 @@
-# New ports collection Makefile for:	strigi
-# Date created:				2008-01-11
-# Whom:					arved
-#
+# Created by: Tilman Keskinoz <arved at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	strigi
 PORTVERSION=	0.7.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://rdieter.fedorapeople.org/strigi/
 #MASTER_SITES=	http://www.vandenoever.info/software/strigi/ \
@@ -16,7 +13,7 @@ MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Desktop searching program
 
 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		clucene.0:${PORTSDIR}/textproc/clucene \
+		clucene-core:${PORTSDIR}/textproc/clucene \
 		dbus-1:${PORTSDIR}/devel/dbus \
 		exiv2.12:${PORTSDIR}/graphics/exiv2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs

Modified: head/deskutils/strigi/pkg-plist
==============================================================================
--- head/deskutils/strigi/pkg-plist	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/deskutils/strigi/pkg-plist	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,6 +1,6 @@
 bin/deepfind
 bin/deepgrep
-bin/luceneindexer
+bin/lucene2indexer
 bin/rdfindexer
 bin/strigiclient
 bin/strigicmd
@@ -95,7 +95,7 @@ lib/strigi/strigiea_digest.so
 lib/strigi/strigiea_ffmpeg.so
 lib/strigi/strigiea_jpeg.so
 lib/strigi/strigiea_riff.so
-lib/strigi/strigiindex_clucene.so
+lib/strigi/strigiindex_cluceneng.so
 lib/strigi/strigila_cpp.so
 lib/strigi/strigila_deb.so
 lib/strigi/strigila_namespaceharvester.so

Modified: head/misc/bibletime/Makefile
==============================================================================
--- head/misc/bibletime/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/misc/bibletime/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	bibletime-devel
-# Date created:		2008-08-12
-# Whom:			Thomas Abthorpe <tabthorpe at FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	bibletime
 PORTVERSION=	2.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde
 MASTER_SITES=	SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
 
@@ -19,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsword-1.6.2.so:${PORTSDIR}/misc/sword
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-LIB_DEPENDS=	clucene.0:${PORTSDIR}/textproc/clucene
+LIB_DEPENDS=	clucene-core:${PORTSDIR}/textproc/clucene
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes

Modified: head/misc/sword/Makefile
==============================================================================
--- head/misc/sword/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/misc/sword/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sword
 PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \
@@ -45,9 +45,9 @@ CONFIGURE_ARGS+=	--without-curl
 .endif
 
 .if ${PORT_OPTIONS:MCLUCENE}
-LIB_DEPENDS+=	clucene:${PORTSDIR}/textproc/clucene \
+LIB_DEPENDS+=	clucene-core:${PORTSDIR}/textproc/clucene \
 		icudata:${PORTSDIR}/devel/icu
-CONFIGURE_ARGS+=	--with-clucene --with-icu
+CONFIGURE_ARGS+=	--with-clucene=${LOCALBASE} --with-icu
 PLIST_SUB+=		ICU="" ICUVER="`${LOCALBASE}/bin/icu-config --version`"
 .else
 CONFIGURE_ARGS+=	--without-clucene --without-icu

Added: head/misc/sword/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/sword/files/patch-configure	Mon Jan 28 22:25:05 2013	(r311137)
@@ -0,0 +1,31 @@
+--- configure.orig	2010-10-22 17:14:28.000000000 -0400
++++ configure	2013-01-10 19:07:36.000000000 -0500
+@@ -16347,25 +16347,13 @@
+ for flag in $with_clucene; do
+ 	if test -z "$clucene_set_failed"; then
+ 		if test -e "$flag/include/CLucene.h"; then
+-# 64-bit checks first
+-			if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
++			if test -e "$flag/lib/libclucene-core.la" || test -e "$flag/lib/libclucene-core.so"; then
+ 				clucene_set_failed=$flag
+-				CLUCENE_LIBS="-L$flag/lib64 -lclucene"
++				CLUCENE_LIBS="-L$flag/lib -lclucene-core"
+ 				if test -e "$flag/include/CLucene/clucene-config.h"; then
+ 					CLUCENE_CXXFLAGS="-I$flag/include"
+ 				else
+-					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib64"
+-				fi
+-			else
+-# 32-bit checks
+-				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
+-					clucene_set_failed=$flag
+-					CLUCENE_LIBS="-L$flag/lib -lclucene"
+-					if test -e "$flag/include/CLucene/clucene-config.h"; then
+-						CLUCENE_CXXFLAGS="-I$flag/include"
+-					else
+-						CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
+-					fi
++					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
+ 				fi
+ 			fi
+ 		fi

Added: head/misc/sword/files/patch-src__modules__swmodule.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/sword/files/patch-src__modules__swmodule.cpp	Mon Jan 28 22:25:05 2013	(r311137)
@@ -0,0 +1,94 @@
+--- src/modules/swmodule.cpp.orig	2009-12-28 13:03:22.000000000 -0500
++++ src/modules/swmodule.cpp	2013-01-10 18:59:59.000000000 -0500
+@@ -40,7 +40,6 @@
+ 
+ #ifdef USELUCENE
+ #include <CLucene.h>
+-#include <CLucene/CLBackwards.h>
+ 
+ //Lucence includes
+ //#include "CLucene.h"
+@@ -59,6 +58,9 @@
+ 
+ using std::vector;
+ 
++extern size_t lucene_utf8towcs(wchar_t *, const char *,  size_t maxslen);
++extern size_t lucene_wcstoutf8 (char *,  const wchar_t *, size_t maxslen);
++
+ SWORD_NAMESPACE_START
+ 
+ SWDisplay SWModule::rawdisp;
+@@ -521,7 +523,7 @@
+ 
+ 			// iterate thru each good module position that meets the search
+ 			bool checkBounds = getKey()->isBoundSet();
+-			for (long i = 0; i < h->length(); i++) {
++			for (unsigned long i = 0; i < h->length(); i++) {
+ 				Document &doc = h->doc(i);
+ 
+ 				// set a temporary verse key to this module position
+@@ -1144,7 +1146,7 @@
+ 
+ 			lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8
+ //			doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED)));
+-			doc->add( *Field::Text(_T("key"), wcharBuffer ) );
++			doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) );
+ 
+ 
+ 			if (includeKeyInSearch) {
+@@ -1155,11 +1157,11 @@
+ 			}
+ 
+ 			lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8
+-			doc->add( *Field::UnStored(_T("content"), wcharBuffer) );
++			doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED));
+ 
+ 			if (strong.length() > 0) {
+ 				lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE);
+-				doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) );
++				doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
+ 			}
+ 
+@@ -1280,12 +1282,12 @@
+ 
+ //printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str());
+ 
+-			doc->add( *Field::UnStored(_T("prox"), wcharBuffer) );
++			doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ 			good = true;
+ 		}
+ 		if (proxLem.length() > 0) {
+ 			lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8
+-			doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) );
++			doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ 			good = true;
+ 		}
+ 		if (good) {
+@@ -1303,20 +1305,20 @@
+ 	//coreWriter->optimize();
+ 	coreWriter->close();
+ 
++	d = FSDirectory::getDirectory(target.c_str());
+ 	if (IndexReader::indexExists(target.c_str())) {
+-		d = FSDirectory::getDirectory(target.c_str(), false);
+ 		if (IndexReader::isLocked(d)) {
+ 			IndexReader::unlock(d);
+ 		}
+-
+-		fsWriter = new IndexWriter( d, an, false);
+-	} else {
+-		d = FSDirectory::getDirectory(target.c_str(), true);
++		fsWriter = new IndexWriter(d, an, false);
++	}
++	else {
+ 		fsWriter = new IndexWriter(d, an, true);
+ 	}
+ 
+ 	Directory *dirs[] = { ramDir, 0 };
+-	fsWriter->addIndexes(dirs);
++	lucene::util::ConstValueArray< lucene::store::Directory *>dirsa(dirs, 1);
++	fsWriter->addIndexes(dirsa);
+ 	fsWriter->close();
+ 
+ 	delete ramDir;

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/textproc/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -69,7 +69,6 @@
     SUBDIR += cl-ppcre-sbcl
     SUBDIR += clit
     SUBDIR += clucene
-    SUBDIR += clucene-contrib
     SUBDIR += coccigrep
     SUBDIR += coco
     SUBDIR += code2html

Modified: head/textproc/clucene/Makefile
==============================================================================
--- head/textproc/clucene/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/textproc/clucene/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,28 +1,25 @@
-# New ports collection makefile for:	clucene
-# Date created:		2006-08-09
-# Whom:			Cheng-Lung Sung <clsung at FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	clucene
-PORTVERSION=	0.9.21
+PORTVERSION=	2.3.3.4
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-core-stable/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-core-unstable/2.3
 DISTNAME=	${PORTNAME}-core-${PORTVERSION}
 
-MAINTAINER=	clsung at FreeBSD.org
+MAINTAINER=	office at FreeBSD.org
 COMMENT=	CLucene is a C++ port of Lucene
 
-GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
+LICENSE=	AL2 LGPL21
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
 
-.include <bsd.port.pre.mk>
+USE_CMAKE=	yes
+USE_ICONV=	yes
+USE_LDCONFIG=	yes
 
-.if defined(WITH_ASCII_SUPPORT)
-CONFIGURE_ARGS+=	--enable-ascii
-.endif
+CMAKE_ARGS=	-DBUILD_CONTRIBS_LIB=ON
+CXXFLAGS+=	-D__LONG_LONG_SUPPORTED
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/clucene/distinfo
==============================================================================
--- head/textproc/clucene/distinfo	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/textproc/clucene/distinfo	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,2 +1,2 @@
-SHA256 (clucene-core-0.9.21.tar.bz2) = ef9af373ea953362e42c9a3bdcbf8ef317bca4a407ffab9fe36c1b2807680630
-SIZE (clucene-core-0.9.21.tar.bz2) = 1530020
+SHA256 (clucene-core-2.3.3.4.tar.gz) = ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
+SIZE (clucene-core-2.3.3.4.tar.gz) = 2241498

Added: head/textproc/clucene/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-CMakeLists.txt	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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 )
+ 
+ 

Added: head/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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

Added: head/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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 )

Added: head/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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();

Added: head/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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;;
+ 	}
+ };
+ 

Added: head/textproc/clucene/files/patch-src__core__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-src__core__CMakeLists.txt	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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 )
+ 
+ 

Added: head/textproc/clucene/files/patch-src__shared__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/clucene/files/patch-src__shared__CMakeLists.txt	Mon Jan 28 22:25:05 2013	(r311137)
@@ -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 )
+ 
+ 
+ ########################################################################

Modified: head/textproc/clucene/pkg-plist
==============================================================================
--- head/textproc/clucene/pkg-plist	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/textproc/clucene/pkg-plist	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,146 +1,395 @@
 include/CLucene.h
-include/CLucene/CLBackwards.h
 include/CLucene/CLConfig.h
 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/LanguageBasedAnalyzer.h
+include/CLucene/analysis/PorterStemmer.h
+include/CLucene/analysis/cjk/CJKAnalyzer.h
+include/CLucene/analysis/de/GermanAnalyzer.h
+include/CLucene/analysis/de/GermanStemFilter.h
+include/CLucene/analysis/de/GermanStemmer.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/ext/boost/assert.hpp
+include/CLucene/ext/boost/checked_delete.hpp
+include/CLucene/ext/boost/config.hpp
+include/CLucene/ext/boost/config/abi/borland_prefix.hpp
+include/CLucene/ext/boost/config/abi/borland_suffix.hpp
+include/CLucene/ext/boost/config/abi/msvc_prefix.hpp
+include/CLucene/ext/boost/config/abi/msvc_suffix.hpp
+include/CLucene/ext/boost/config/abi_prefix.hpp
+include/CLucene/ext/boost/config/abi_suffix.hpp
+include/CLucene/ext/boost/config/auto_link.hpp
+include/CLucene/ext/boost/config/compiler/borland.hpp
+include/CLucene/ext/boost/config/compiler/codegear.hpp
+include/CLucene/ext/boost/config/compiler/comeau.hpp
+include/CLucene/ext/boost/config/compiler/common_edg.hpp
+include/CLucene/ext/boost/config/compiler/compaq_cxx.hpp
+include/CLucene/ext/boost/config/compiler/digitalmars.hpp
+include/CLucene/ext/boost/config/compiler/gcc.hpp
+include/CLucene/ext/boost/config/compiler/gcc_xml.hpp
+include/CLucene/ext/boost/config/compiler/greenhills.hpp
+include/CLucene/ext/boost/config/compiler/hp_acc.hpp
+include/CLucene/ext/boost/config/compiler/intel.hpp
+include/CLucene/ext/boost/config/compiler/kai.hpp
+include/CLucene/ext/boost/config/compiler/metrowerks.hpp
+include/CLucene/ext/boost/config/compiler/mpw.hpp
+include/CLucene/ext/boost/config/compiler/pgi.hpp
+include/CLucene/ext/boost/config/compiler/sgi_mipspro.hpp
+include/CLucene/ext/boost/config/compiler/sunpro_cc.hpp
+include/CLucene/ext/boost/config/compiler/vacpp.hpp
+include/CLucene/ext/boost/config/compiler/visualc.hpp
+include/CLucene/ext/boost/config/no_tr1/cmath.hpp
+include/CLucene/ext/boost/config/no_tr1/complex.hpp
+include/CLucene/ext/boost/config/no_tr1/functional.hpp
+include/CLucene/ext/boost/config/no_tr1/memory.hpp
+include/CLucene/ext/boost/config/no_tr1/utility.hpp
+include/CLucene/ext/boost/config/platform/aix.hpp
+include/CLucene/ext/boost/config/platform/amigaos.hpp
+include/CLucene/ext/boost/config/platform/beos.hpp
+include/CLucene/ext/boost/config/platform/bsd.hpp
+include/CLucene/ext/boost/config/platform/cygwin.hpp
+include/CLucene/ext/boost/config/platform/hpux.hpp
+include/CLucene/ext/boost/config/platform/irix.hpp
+include/CLucene/ext/boost/config/platform/linux.hpp
+include/CLucene/ext/boost/config/platform/macos.hpp
+include/CLucene/ext/boost/config/platform/qnxnto.hpp
+include/CLucene/ext/boost/config/platform/solaris.hpp
+include/CLucene/ext/boost/config/platform/vxworks.hpp
+include/CLucene/ext/boost/config/platform/win32.hpp
+include/CLucene/ext/boost/config/posix_features.hpp
+include/CLucene/ext/boost/config/requires_threads.hpp
+include/CLucene/ext/boost/config/select_compiler_config.hpp
+include/CLucene/ext/boost/config/select_platform_config.hpp
+include/CLucene/ext/boost/config/select_stdlib_config.hpp
+include/CLucene/ext/boost/config/stdlib/dinkumware.hpp
+include/CLucene/ext/boost/config/stdlib/libcomo.hpp
+include/CLucene/ext/boost/config/stdlib/libstdcpp3.hpp
+include/CLucene/ext/boost/config/stdlib/modena.hpp
+include/CLucene/ext/boost/config/stdlib/msl.hpp
+include/CLucene/ext/boost/config/stdlib/roguewave.hpp
+include/CLucene/ext/boost/config/stdlib/sgi.hpp
+include/CLucene/ext/boost/config/stdlib/stlport.hpp
+include/CLucene/ext/boost/config/stdlib/vacpp.hpp
+include/CLucene/ext/boost/config/suffix.hpp
+include/CLucene/ext/boost/config/user.hpp
+include/CLucene/ext/boost/config/warning_disable.hpp
+include/CLucene/ext/boost/current_function.hpp
+include/CLucene/ext/boost/detail/algorithm.hpp
+include/CLucene/ext/boost/detail/allocator_utilities.hpp
+include/CLucene/ext/boost/detail/atomic_count.hpp
+include/CLucene/ext/boost/detail/binary_search.hpp
+include/CLucene/ext/boost/detail/call_traits.hpp
+include/CLucene/ext/boost/detail/catch_exceptions.hpp
+include/CLucene/ext/boost/detail/compressed_pair.hpp
+include/CLucene/ext/boost/detail/container_fwd.hpp
+include/CLucene/ext/boost/detail/dynamic_bitset.hpp
+include/CLucene/ext/boost/detail/endian.hpp
+include/CLucene/ext/boost/detail/has_default_constructor.hpp
+include/CLucene/ext/boost/detail/identifier.hpp
+include/CLucene/ext/boost/detail/indirect_traits.hpp
+include/CLucene/ext/boost/detail/interlocked.hpp
+include/CLucene/ext/boost/detail/is_function_ref_tester.hpp
+include/CLucene/ext/boost/detail/is_incrementable.hpp
+include/CLucene/ext/boost/detail/is_xxx.hpp
+include/CLucene/ext/boost/detail/iterator.hpp
+include/CLucene/ext/boost/detail/lcast_precision.hpp
+include/CLucene/ext/boost/detail/lightweight_mutex.hpp
+include/CLucene/ext/boost/detail/lightweight_test.hpp
+include/CLucene/ext/boost/detail/lightweight_thread.hpp
+include/CLucene/ext/boost/detail/limits.hpp
+include/CLucene/ext/boost/detail/named_template_params.hpp
+include/CLucene/ext/boost/detail/no_exceptions_support.hpp
+include/CLucene/ext/boost/detail/none_t.hpp
+include/CLucene/ext/boost/detail/numeric_traits.hpp
+include/CLucene/ext/boost/detail/ob_call_traits.hpp
+include/CLucene/ext/boost/detail/ob_compressed_pair.hpp
+include/CLucene/ext/boost/detail/quick_allocator.hpp
+include/CLucene/ext/boost/detail/reference_content.hpp
+include/CLucene/ext/boost/detail/scoped_enum_emulation.hpp
+include/CLucene/ext/boost/detail/select_type.hpp
+include/CLucene/ext/boost/detail/sp_typeinfo.hpp
+include/CLucene/ext/boost/detail/templated_streams.hpp
+include/CLucene/ext/boost/detail/utf8_codecvt_facet.hpp
+include/CLucene/ext/boost/detail/workaround.hpp
+include/CLucene/ext/boost/exception/all.hpp
+include/CLucene/ext/boost/exception/current_exception_cast.hpp
+include/CLucene/ext/boost/exception/detail/attribute_noreturn.hpp
+include/CLucene/ext/boost/exception/detail/error_info_impl.hpp
+include/CLucene/ext/boost/exception/detail/exception_ptr.hpp
+include/CLucene/ext/boost/exception/detail/is_output_streamable.hpp
+include/CLucene/ext/boost/exception/detail/object_hex_dump.hpp
+include/CLucene/ext/boost/exception/detail/type_info.hpp
+include/CLucene/ext/boost/exception/diagnostic_information.hpp
+include/CLucene/ext/boost/exception/enable_current_exception.hpp
+include/CLucene/ext/boost/exception/enable_error_info.hpp
+include/CLucene/ext/boost/exception/errinfo_api_function.hpp
+include/CLucene/ext/boost/exception/errinfo_at_line.hpp
+include/CLucene/ext/boost/exception/errinfo_errno.hpp
+include/CLucene/ext/boost/exception/errinfo_file_handle.hpp
+include/CLucene/ext/boost/exception/errinfo_file_name.hpp
+include/CLucene/ext/boost/exception/errinfo_file_open_mode.hpp
+include/CLucene/ext/boost/exception/errinfo_nested_exception.hpp
+include/CLucene/ext/boost/exception/errinfo_type_info_name.hpp
+include/CLucene/ext/boost/exception/error_info.hpp
+include/CLucene/ext/boost/exception/exception.hpp
+include/CLucene/ext/boost/exception/get_error_info.hpp
+include/CLucene/ext/boost/exception/info.hpp
+include/CLucene/ext/boost/exception/info_tuple.hpp
+include/CLucene/ext/boost/exception/to_string.hpp
+include/CLucene/ext/boost/exception/to_string_stub.hpp
+include/CLucene/ext/boost/memory_order.hpp
+include/CLucene/ext/boost/shared_ptr.hpp
+include/CLucene/ext/boost/smart_ptr/bad_weak_ptr.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count_gcc.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count_pthreads.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count_solaris.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count_sync.hpp
+include/CLucene/ext/boost/smart_ptr/detail/atomic_count_win32.hpp
+include/CLucene/ext/boost/smart_ptr/detail/lightweight_mutex.hpp
+include/CLucene/ext/boost/smart_ptr/detail/lwm_nop.hpp
+include/CLucene/ext/boost/smart_ptr/detail/lwm_pthreads.hpp
+include/CLucene/ext/boost/smart_ptr/detail/lwm_win32_cs.hpp
+include/CLucene/ext/boost/smart_ptr/detail/operator_bool.hpp
+include/CLucene/ext/boost/smart_ptr/detail/quick_allocator.hpp
+include/CLucene/ext/boost/smart_ptr/detail/shared_array_nmt.hpp
+include/CLucene/ext/boost/smart_ptr/detail/shared_count.hpp
+include/CLucene/ext/boost/smart_ptr/detail/shared_ptr_nmt.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_convertible.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_pt.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_sync.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_counted_impl.hpp
+include/CLucene/ext/boost/smart_ptr/detail/sp_has_sync.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock_nt.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock_pool.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock_pt.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock_sync.hpp
+include/CLucene/ext/boost/smart_ptr/detail/spinlock_w32.hpp
+include/CLucene/ext/boost/smart_ptr/detail/yield_k.hpp
+include/CLucene/ext/boost/smart_ptr/enable_shared_from_this.hpp
+include/CLucene/ext/boost/smart_ptr/enable_shared_from_this2.hpp
+include/CLucene/ext/boost/smart_ptr/intrusive_ptr.hpp
+include/CLucene/ext/boost/smart_ptr/make_shared.hpp
+include/CLucene/ext/boost/smart_ptr/scoped_array.hpp
+include/CLucene/ext/boost/smart_ptr/scoped_ptr.hpp
+include/CLucene/ext/boost/smart_ptr/shared_array.hpp
+include/CLucene/ext/boost/smart_ptr/shared_ptr.hpp
+include/CLucene/ext/boost/smart_ptr/weak_ptr.hpp
+include/CLucene/ext/boost/throw_exception.hpp
+include/CLucene/ext/boost/version.hpp
+include/CLucene/highlighter/Encoder.h
+include/CLucene/highlighter/Formatter.h
+include/CLucene/highlighter/Fragmenter.h
+include/CLucene/highlighter/HighlightScorer.h
+include/CLucene/highlighter/Highlighter.h
+include/CLucene/highlighter/QueryScorer.h
+include/CLucene/highlighter/QueryTermExtractor.h
+include/CLucene/highlighter/Scorer.h
+include/CLucene/highlighter/SimpleFragmenter.h
+include/CLucene/highlighter/SimpleHTMLEncoder.h
+include/CLucene/highlighter/SimpleHTMLFormatter.h
+include/CLucene/highlighter/TextFragment.h
+include/CLucene/highlighter/TokenGroup.h
+include/CLucene/highlighter/TokenSources.h
+include/CLucene/highlighter/WeightedTerm.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/snowball/SnowballAnalyzer.h
+include/CLucene/snowball/SnowballFilter.h
+include/CLucene/snowball/include/libstemmer.h
+include/CLucene/snowball/libstemmer.h
+include/CLucene/snowball/libstemmer/modules.h
+include/CLucene/snowball/runtime/api.h
+include/CLucene/snowball/runtime/header.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_danish.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_english.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_french.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_german.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_italian.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_porter.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.h
+include/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.h
+include/CLucene/snowball/src_c/stem_KOI8_R_russian.h
+include/CLucene/snowball/src_c/stem_UTF_8_danish.h
+include/CLucene/snowball/src_c/stem_UTF_8_dutch.h
+include/CLucene/snowball/src_c/stem_UTF_8_english.h
+include/CLucene/snowball/src_c/stem_UTF_8_finnish.h
+include/CLucene/snowball/src_c/stem_UTF_8_french.h
+include/CLucene/snowball/src_c/stem_UTF_8_german.h
+include/CLucene/snowball/src_c/stem_UTF_8_italian.h
+include/CLucene/snowball/src_c/stem_UTF_8_norwegian.h
+include/CLucene/snowball/src_c/stem_UTF_8_porter.h
+include/CLucene/snowball/src_c/stem_UTF_8_portuguese.h
+include/CLucene/snowball/src_c/stem_UTF_8_russian.h
+include/CLucene/snowball/src_c/stem_UTF_8_spanish.h
+include/CLucene/snowball/src_c/stem_UTF_8_swedish.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.a
-lib/libclucene.la
-lib/libclucene.so
-lib/libclucene.so.0
- at dirrmtry lib/CLucene
- at dirrmtry include/CLucene/util
- at dirrmtry include/CLucene/store
- at dirrmtry include/CLucene/search
- at dirrmtry include/CLucene/queryParser
- at dirrmtry include/CLucene/index
- at dirrmtry include/CLucene/document
- at dirrmtry include/CLucene/debug
- at dirrmtry include/CLucene/config
- at dirrmtry include/CLucene/analysis/standard
- at dirrmtry include/CLucene/analysis
- at dirrmtry include/CLucene
+include/CLucene/util/arrayinputstream.h
+include/CLucene/util/byteinputstream.h
+include/CLucene/util/gzipcompressstream.h
+include/CLucene/util/gzipinputstream.h
+include/CLucene/util/streamarray.h
+lib/CLucene/CLuceneConfig.cmake
+lib/libclucene-contribs-lib.so
+lib/libclucene-contribs-lib.so.1
+lib/libclucene-contribs-lib.so.2.3.3.4
+lib/libclucene-core.so
+lib/libclucene-core.so.1
+lib/libclucene-core.so.2.3.3.4
+lib/libclucene-shared.so
+lib/libclucene-shared.so.1
+lib/libclucene-shared.so.2.3.3.4
+libdata/pkgconfig/libclucene-core.pc
+ at dirrm lib/CLucene
+ at dirrm include/CLucene/util
+ at dirrm include/CLucene/store
+ at dirrm include/CLucene/snowball/src_c
+ at dirrm include/CLucene/snowball/runtime
+ at dirrm include/CLucene/snowball/libstemmer
+ at dirrm include/CLucene/snowball/include
+ at dirrm include/CLucene/snowball
+ at dirrm include/CLucene/search/spans
+ at dirrm include/CLucene/search
+ at dirrm include/CLucene/queryParser/legacy
+ at dirrm include/CLucene/queryParser
+ at dirrm include/CLucene/index
+ at dirrm include/CLucene/highlighter
+ at dirrm include/CLucene/ext/boost/smart_ptr/detail
+ at dirrm include/CLucene/ext/boost/smart_ptr
+ at dirrm include/CLucene/ext/boost/exception/detail
+ at dirrm include/CLucene/ext/boost/exception
+ at dirrm include/CLucene/ext/boost/detail
+ at dirrm include/CLucene/ext/boost/config/stdlib
+ at dirrm include/CLucene/ext/boost/config/platform
+ at dirrm include/CLucene/ext/boost/config/no_tr1
+ at dirrm include/CLucene/ext/boost/config/compiler
+ at dirrm include/CLucene/ext/boost/config/abi
+ at dirrm include/CLucene/ext/boost/config
+ at dirrm include/CLucene/ext/boost
+ at dirrm include/CLucene/ext
+ at dirrm include/CLucene/document
+ at dirrm include/CLucene/debug
+ at dirrm include/CLucene/analysis/standard
+ at dirrm include/CLucene/analysis/de
+ at dirrm include/CLucene/analysis/cjk
+ at dirrm include/CLucene/analysis
+ at dirrm include/CLucene

Modified: head/textproc/p5-Lucene/Makefile
==============================================================================
--- head/textproc/p5-Lucene/Makefile	Mon Jan 28 21:39:20 2013	(r311136)
+++ head/textproc/p5-Lucene/Makefile	Mon Jan 28 22:25:05 2013	(r311137)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	textproc/p5-Lucene
-# Date created:				20 Feb 2007
-# Whom:					Cheng-Lung Sung <clsung at FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Lucene
 PORTVERSION=	0.18
@@ -15,7 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl at FreeBSD.org
 COMMENT=	API to the C++ port of the Lucene search engine
 
-LIB_DEPENDS=	clucene:${PORTSDIR}/textproc/clucene
+LIB_DEPENDS=	clucene-core:${PORTSDIR}/textproc/clucene
+
+BROKEN=		incompatible with CLucene 2.3
 
 PERL_CONFIGURE=	yes
 CC=		${CXX}

More information about the svn-ports-head mailing list