From 8b5bd8dd10a1eb2b7144e160f942cf73dcfb9bc0 Mon Sep 17 00:00:00 2001
From: Beech Rintoul <beech@FreeBSD.org>
Date: Tue, 12 Jul 2011 23:58:23 +0000
Subject: [PATCH] - Update to 2.9.4

PR:		ports/158415
Submitted by:	Pedro Giffuni <giffunip@tutopia.com>
Approved by:	Maintainer Timeout (Two Weeks)
---
 textproc/lucene/Makefile | 21 +++++++++++++++++----
 textproc/lucene/distinfo |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index 35b1076883c1..763784bbf43e 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -5,17 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	lucene
-PORTVERSION=	2.4.1
+PORTVERSION=	2.9.4
 CATEGORIES=	textproc java devel
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/java,}
+MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/java/$(PORTVERSION),}
 DISTNAME=	lucene-${PORTVERSION}
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	A full-text search engine for Java
 
+LICENSE=	ASL
+
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.4+
 
 OPTIONS=	DOCS    "Install docs & examples" on \
 		CONTRIB "Install contribs" off
@@ -25,15 +27,21 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
 CONTRIBS=	analyzers \
 		ant \
 		benchmark \
+		collation	\
+		bdb	\
+		bdb-je	\
 		instantiated \
 		highlighter \
 		lucli \
 		memory \
 		misc \
 		queries \
+		queryparser	\
 		regex \
-		similarity \
+		remote	\
+		smartcn \
 		snowball \
+		spatial \
 		spellchecker \
 		surround \
 		swing \
@@ -62,6 +70,11 @@ DEMODIR=	src/demo/org/apache/lucene/demo
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
 .if defined(WITH_CONTRIB)
+	${MV} ${WRKSRC}/contrib/analyzers/common/*.jar ${WRKSRC}/contrib/analyzers/
+	${RMDIR} ${WRKSRC}/contrib/analyzers/common
+	${MV} ${WRKSRC}/contrib/analyzers/smartcn/ ${WRKSRC}/contrib/
+	${MV} ${WRKSRC}/contrib/db/bdb/ ${WRKSRC}/contrib/bdb
+	${MV} ${WRKSRC}/contrib/db/bdb-je/ ${WRKSRC}/contrib/bdb-je
 	${INSTALL_DATA} \
 	    ${CONTRIBS:C,^(.*)$,${WRKSRC}/contrib/\1/${PORTNAME}-\1-${PORTVERSION}.jar,} \
 	    ${JAVAJARDIR}
diff --git a/textproc/lucene/distinfo b/textproc/lucene/distinfo
index f23c6e3e198c..295bd9d525cb 100644
--- a/textproc/lucene/distinfo
+++ b/textproc/lucene/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lucene-2.4.1.tar.gz) = 359657971d74b8ef7a31f6dc1a55abd0cde854d4a28351d4cbea2f21c7487087
-SIZE (lucene-2.4.1.tar.gz) = 8772527
+SHA256 (lucene-2.9.4.tar.gz) = e04fb2aa72e828c2f1b9a80823edfd9935915e83b19a9f9d84ebe92ab2232b00
+SIZE (lucene-2.9.4.tar.gz) = 18096066