diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index a3475c765428..4e5c24752f35 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	lucene
 PORTVERSION=	3.6.2
 # Be sure to chase devel/openoffice-devel and textproc/py-lucene
 # when updating this
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/java/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search engine for Java
 WWW=		https://lucene.apache.org/core/
 
 LICENSE=	APACHE20
 
-CONFLICTS=	lucene4-[0-9].*
-
-PORTSCOUT=	limit:^3\.
-
 USES=		cpe tar:tgz
 USE_JAVA=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
+CONFLICTS=	lucene4-[0-9].*
+
+PORTSCOUT=	limit:^3\.
+
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=	CONTRIB DOCS EXAMPLES
-CONTRIB_DESC=	Install contributed jars
+CONTRIB_DESC=	Install contributed jars (required by openoffice)
 OPTIONS_DEFAULT=	CONTRIB
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}-core-${PORTVERSION}.jar
 
 CONTRIBS=	benchmark \
 		demo \
 		facet	\
 		grouping \
 		highlighter \
 		icu \
 		instantiated \
 		join	\
 		memory \
 		misc \
 		pruning \
 		queries \
 		queryparser	\
 		remote	\
 		spatial \
 		spellchecker \
 		xml-query-parser
 
 EXTRA_CONTRIBS_BASE=	analyzers
 
 EXTRA_CONTRIBS_DIRS=	kuromoji \
 		phonetic \
 		smartcn \
 		stempel
 
 .for f in ${EXTRA_CONTRIBS_BASE} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
-CONTRIB_PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
+CONTRIB_PLIST_FILES+=	${JAVAJARDIR}/${PORTNAME}-${f}-${PORTVERSION}.jar
 .endfor
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 DEMODIR=	contrib/demo
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
 
 do-install-CONTRIB-on:
 .for f in ${CONTRIBS}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
 .endfor
 .for d in ${EXTRA_CONTRIBS_DIRS}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/${d}/${PORTNAME}-${d}-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}
 .endfor
 	${INSTALL_DATA} \
 		${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/common/${PORTNAME}-${EXTRA_CONTRIBS_BASE}-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} "-not -empty")
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/${DEMODIR} && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>