From 8a552cf9fadff7641fb44f81a209e11d709ebac2 Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Sat, 11 Oct 2014 07:28:56 +0000
Subject: [PATCH] devel/opengrok: Make the installed version runnable (and
 usable)

PR:		194177
Reported by:	shen.elf (gmail)
Fixed by:	marino and shen.elf
---
 devel/opengrok/Makefile          |  4 +++-
 devel/opengrok/files/opengrok.in |  2 +-
 devel/opengrok/pkg-plist         | 13 +------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 0f6bdd4ce59c..0875fcf138d6 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	opengrok
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://java.net/projects/opengrok/downloads/download/
 
@@ -20,7 +21,7 @@ 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}
@@ -41,6 +42,7 @@ 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 \
diff --git a/devel/opengrok/files/opengrok.in b/devel/opengrok/files/opengrok.in
index f04341d29788..6a46c20e965c 100644
--- a/devel/opengrok/files/opengrok.in
+++ b/devel/opengrok/files/opengrok.in
@@ -12,4 +12,4 @@ 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 $*
diff --git a/devel/opengrok/pkg-plist b/devel/opengrok/pkg-plist
index a415338bd637..ba32e98cd9be 100644
--- a/devel/opengrok/pkg-plist
+++ b/devel/opengrok/pkg-plist
@@ -2,6 +2,7 @@ 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
@@ -115,15 +116,3 @@ bin/opengrok
 %%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%%