diff -ruN lucene.orig/Makefile lucene/Makefile
--- lucene.orig/Makefile	2011-09-28 23:55:13.000000000 +0000
+++ lucene/Makefile	2011-09-28 23:55:53.000000000 +0000
@@ -5,10 +5,11 @@
 # $FreeBSD: ports/textproc/lucene/Makefile,v 1.9 2011/07/21 02:45:03 linimon Exp $
 
 PORTNAME=	lucene
-PORTVERSION=	2.9.4
+PORTVERSION=	3.4.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/java/$(PORTVERSION),}
 DISTNAME=	lucene-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	A full-text search engine for Java
@@ -25,27 +26,20 @@
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
 
 CONTRIBS=	analyzers \
-		ant \
 		benchmark \
-		collation	\
-		bdb	\
-		bdb-je	\
-		instantiated \
+		grouping \
 		highlighter \
-		lucli \
+		icu \
+		instantiated \
 		memory \
 		misc \
 		queries \
 		queryparser	\
-		regex \
 		remote	\
 		smartcn \
-		snowball \
 		spatial \
 		spellchecker \
-		surround \
-		swing \
-		wikipedia \
+		stempel \
 		wordnet \
 		xml-query-parser
 
@@ -65,16 +59,19 @@
 PORTDOCS=	*
 .endif
 
-DEMODIR=	src/demo/org/apache/lucene/demo
+DEMODIR=	contrib/demo
 
-do-install:
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
 .if defined(WITH_CONTRIB)
-	${MV} ${WRKSRC}/contrib/analyzers/common/*.jar ${WRKSRC}/contrib/analyzers/
+post-extract:
+	${MV} ${WRKSRC}/contrib/analyzers/common/* ${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
+	${MV} ${WRKSRC}/contrib/analyzers/stempel/ ${WRKSRC}/contrib/
+.endif
+
+do-install:
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${JAVAJARDIR}
+.if defined(WITH_CONTRIB)
 	${INSTALL_DATA} \
 	    ${CONTRIBS:C,^(.*)$,${WRKSRC}/contrib/\1/${PORTNAME}-\1-${PORTVERSION}.jar,} \
 	    ${JAVAJARDIR}
@@ -92,10 +89,11 @@
 	@cd ${WRKSRC}/${DEMODIR} \
 	    && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
 	    && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
+PLIST_FILES+=%%DOCSDIR%%/.htaccess
 .endif
 
-post-install:
 .if !defined(NOPORTDOCS)
+post-install:
 	@${FIND} -s ${WRKSRC}/${DEMODIR} -not -type d \
 	    | ${SED} -ne 's,^${WRKSRC}/${DEMODIR},${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC}/${DEMODIR} -type d \
diff -ruN lucene.orig/distinfo lucene/distinfo
--- lucene.orig/distinfo	2011-09-28 23:55:13.000000000 +0000
+++ lucene/distinfo	2011-09-29 00:01:34.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (lucene-2.9.4.tar.gz) = e04fb2aa72e828c2f1b9a80823edfd9935915e83b19a9f9d84ebe92ab2232b00
-SIZE (lucene-2.9.4.tar.gz) = 18096066
+SHA256 (lucene-3.4.0.tgz) = 56fa8afd3b9cbce1b990aa10dd9af30aef434a06506f08814fb6b8c7c526af57
+SIZE (lucene-3.4.0.tgz) = 42933801