Index: head/devel/opengrok/Makefile
===================================================================
--- head/devel/opengrok/Makefile	(revision 370624)
+++ head/devel/opengrok/Makefile	(revision 370625)
@@ -1,82 +1,84 @@
 # $FreeBSD$
 
 PORTNAME=	opengrok
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://java.net/projects/opengrok/downloads/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and powerful code search and cross-reference engine
 
 LICENSE=	CDDL APACHE20
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 SHAREOWN=	www
 SHAREGRP=	www
 NO_BUILD=	yes
 PORTDOCS=	${DOCS}
 SUB_FILES=	opengrok
-SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/,}" \
+SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/lib/,}" \
 		JARFILE="${JARFILE}"
 PLIST_SUB=	T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \
 		OWNER=${SHAREOWN} GROUP=${SHAREGRP}
 
 OPTIONS_SINGLE=		AS
 OPTIONS_SINGLE_AS=	TOMCAT7 TOMCAT6 RESIN3
 OPTIONS_DEFAULT=	TOMCAT6
 
 TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
 TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
 RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
 RESIN3_RUN_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
 
 JARFILE=	${DATADIR}/opengrok.jar
 DOCS=		CHANGES.txt EXAMPLE.txt LICENSE.txt
 LIBFILES=	ant.jar \
 		bcel-5.2.jar \
 		jrcs.jar \
+		lucene-analyzers-common-4.7.1.jar \
 		lucene-core-4.7.1.jar \
 		lucene-queryparser-4.7.1.jar \
 		lucene-suggest-4.7.1.jar \
 		swing-layout-0.9.jar
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 WEBAPP_HOME?=	${LOCALBASE}/apache-tomcat-7.0
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 WEBAPP_HOME?=	${LOCALBASE}/apache-tomcat-6.0
 .endif
 
 .if ${PORT_OPTIONS:MRESIN3}
 WEBAPP_HOME?=	${LOCALBASE}/resin3
 .endif
 
 WEBAPPS_DIR=	${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/lib/opengrok
 	@${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib ${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}
 	(cd ${WRKSRC}/lib/opengrok && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME})
 	(cd ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF && \
 		${MV} web.xml web.xml.sample)
 	${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} \
 		${STAGEDIR}${DATADIR}/lib/
 	${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/devel/opengrok/files/opengrok.in
===================================================================
--- head/devel/opengrok/files/opengrok.in	(revision 370624)
+++ head/devel/opengrok/files/opengrok.in	(revision 370625)
@@ -1,15 +1,15 @@
 #!/bin/csh
 #
 # $FreeBSD$
 
 set JAVA = "%%LOCALBASE%%/bin/java"
 set LIBFILES = "%%LIBFILES%%"
 setenv JAVA_VERSION "%%JAVA_VERSION%%"
 
 if ( "${LIBFILES}" != "" ) then
 	set CLASSPATH = `echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`
 else
 	set CLASSPATH = ""
 endif
 
-exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/exctags $*
+exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/exctags -w opengrok $*
Index: head/devel/opengrok/pkg-plist
===================================================================
--- head/devel/opengrok/pkg-plist	(revision 370624)
+++ head/devel/opengrok/pkg-plist	(revision 370625)
@@ -1,129 +1,118 @@
 bin/opengrok
 %%DATADIR%%/lib/ant.jar
 %%DATADIR%%/lib/bcel-5.2.jar
 %%DATADIR%%/lib/jrcs.jar
+%%DATADIR%%/lib/lucene-analyzers-common-4.7.1.jar
 %%DATADIR%%/lib/lucene-core-4.7.1.jar
 %%DATADIR%%/lib/lucene-queryparser-4.7.1.jar
 %%DATADIR%%/lib/lucene-suggest-4.7.1.jar
 %%DATADIR%%/lib/swing-layout-0.9.jar
 %%DATADIR%%/opengrok.jar
 @group %%OWNER%%
 @owner %%GROUP%%
 %%T%%/webapps/opengrok/META-INF/MANIFEST.MF
 %%T%%/webapps/opengrok/WEB-INF/lib/ant.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/bcel-5.2.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/jrcs.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/lucene-analyzers-common-4.7.1.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-4.7.1.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/lucene-queryparser-4.7.1.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/lucene-suggest-4.7.1.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/opengrok.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/swing-layout-0.9.jar
 @sample %%T%%/webapps/opengrok/WEB-INF/web.xml.sample
 %%T%%/webapps/opengrok/default/img/Logo.png
 %%T%%/webapps/opengrok/default/img/bg.png
 %%T%%/webapps/opengrok/default/img/button1.png
 %%T%%/webapps/opengrok/default/img/button2.png
 %%T%%/webapps/opengrok/default/img/combined.png
 %%T%%/webapps/opengrok/default/img/icon.png
 %%T%%/webapps/opengrok/default/img/indicator.gif
 %%T%%/webapps/opengrok/default/img/rss.png
 %%T%%/webapps/opengrok/default/img/servedby.png
 %%T%%/webapps/opengrok/default/img/transparent_pixel.gif
 %%T%%/webapps/opengrok/default/jquery.autocomplete.css
 %%T%%/webapps/opengrok/default/jquery.combo.css
 %%T%%/webapps/opengrok/default/jquery.tooltip.css
 %%T%%/webapps/opengrok/default/print.css
 %%T%%/webapps/opengrok/default/style.css
 %%T%%/webapps/opengrok/diff.jsp
 %%T%%/webapps/opengrok/enoent.jsp
 %%T%%/webapps/opengrok/error.jsp
 %%T%%/webapps/opengrok/foot.jspf
 %%T%%/webapps/opengrok/help.jsp
 %%T%%/webapps/opengrok/history.jsp
 %%T%%/webapps/opengrok/httpheader.jspf
 %%T%%/webapps/opengrok/index.jsp
 %%T%%/webapps/opengrok/index_body.html
 %%T%%/webapps/opengrok/jquery-1.4.4.min.js
 %%T%%/webapps/opengrok/jquery.autocomplete-1.1.pack.js
 %%T%%/webapps/opengrok/jquery.tooltip-1.3.pack.js
 %%T%%/webapps/opengrok/list.jsp
 %%T%%/webapps/opengrok/mast.jsp
 %%T%%/webapps/opengrok/menu.jspf
 %%T%%/webapps/opengrok/more.jsp
 %%T%%/webapps/opengrok/offwhite/img/Logo.png
 %%T%%/webapps/opengrok/offwhite/img/b.gif
 %%T%%/webapps/opengrok/offwhite/img/bg.png
 %%T%%/webapps/opengrok/offwhite/img/button1.png
 %%T%%/webapps/opengrok/offwhite/img/button2.png
 %%T%%/webapps/opengrok/offwhite/img/combined.png
 %%T%%/webapps/opengrok/offwhite/img/d.gif
 %%T%%/webapps/opengrok/offwhite/img/do.gif
 %%T%%/webapps/opengrok/offwhite/img/f.gif
 %%T%%/webapps/opengrok/offwhite/img/h.gif
 %%T%%/webapps/opengrok/offwhite/img/icon.png
 %%T%%/webapps/opengrok/offwhite/img/indicator.gif
 %%T%%/webapps/opengrok/offwhite/img/l.gif
 %%T%%/webapps/opengrok/offwhite/img/p.gif
 %%T%%/webapps/opengrok/offwhite/img/q.gif
 %%T%%/webapps/opengrok/offwhite/img/r.gif
 %%T%%/webapps/opengrok/offwhite/img/rss.png
 %%T%%/webapps/opengrok/offwhite/img/servedby.png
 %%T%%/webapps/opengrok/offwhite/img/t.gif
 %%T%%/webapps/opengrok/offwhite/img/transparent_pixel.gif
 %%T%%/webapps/opengrok/offwhite/img/w.gif
 %%T%%/webapps/opengrok/offwhite/jquery.autocomplete.css
 %%T%%/webapps/opengrok/offwhite/jquery.combo.css
 %%T%%/webapps/opengrok/offwhite/jquery.tooltip.css
 %%T%%/webapps/opengrok/offwhite/print.css
 %%T%%/webapps/opengrok/offwhite/style.css
 %%T%%/webapps/opengrok/opensearch.jsp
 %%T%%/webapps/opengrok/pageconfig.jspf
 %%T%%/webapps/opengrok/pageheader.jspf
 %%T%%/webapps/opengrok/polished/img/Logo.png
 %%T%%/webapps/opengrok/polished/img/b.gif
 %%T%%/webapps/opengrok/polished/img/bg.png
 %%T%%/webapps/opengrok/polished/img/button1.png
 %%T%%/webapps/opengrok/polished/img/button2.png
 %%T%%/webapps/opengrok/polished/img/combined.png
 %%T%%/webapps/opengrok/polished/img/d.gif
 %%T%%/webapps/opengrok/polished/img/do.gif
 %%T%%/webapps/opengrok/polished/img/f.gif
 %%T%%/webapps/opengrok/polished/img/h.gif
 %%T%%/webapps/opengrok/polished/img/icon.png
 %%T%%/webapps/opengrok/polished/img/indicator.gif
 %%T%%/webapps/opengrok/polished/img/l.gif
 %%T%%/webapps/opengrok/polished/img/p.gif
 %%T%%/webapps/opengrok/polished/img/q.gif
 %%T%%/webapps/opengrok/polished/img/r.gif
 %%T%%/webapps/opengrok/polished/img/rss.png
 %%T%%/webapps/opengrok/polished/img/servedby.png
 %%T%%/webapps/opengrok/polished/img/t.gif
 %%T%%/webapps/opengrok/polished/img/transparent_pixel.gif
 %%T%%/webapps/opengrok/polished/img/w.gif
 %%T%%/webapps/opengrok/polished/jquery.autocomplete.css
 %%T%%/webapps/opengrok/polished/jquery.combo.css
 %%T%%/webapps/opengrok/polished/jquery.tooltip.css
 %%T%%/webapps/opengrok/polished/print.css
 %%T%%/webapps/opengrok/polished/style.css
 %%T%%/webapps/opengrok/projects.jspf
 %%T%%/webapps/opengrok/raw.jsp
 %%T%%/webapps/opengrok/rss.jsp
 %%T%%/webapps/opengrok/rss.xsl.xml
 %%T%%/webapps/opengrok/search.jsp
 %%T%%/webapps/opengrok/status.jsp
 %%T%%/webapps/opengrok/utils.js
 @group
 @owner
-@dirrmtry %%T%%/webapps/opengrok/META-INF
-@dirrmtry %%T%%/webapps/opengrok/WEB-INF/lib
-@dirrmtry %%T%%/webapps/opengrok/WEB-INF
-@dirrmtry %%T%%/webapps/opengrok/default/img
-@dirrmtry %%T%%/webapps/opengrok/default
-@dirrmtry %%T%%/webapps/opengrok/offwhite/img
-@dirrmtry %%T%%/webapps/opengrok/offwhite
-@dirrmtry %%T%%/webapps/opengrok/polished/img
-@dirrmtry %%T%%/webapps/opengrok/polished
-@dirrmtry %%T%%/webapps/opengrok
-@dirrmtry %%DATADIR%%/lib
-@dirrmtry %%DATADIR%%