svn commit: r370625 - in head/devel/opengrok: . files

[John Marino]

Author: marino
Date: Sat Oct 11 07:28:56 2014
New Revision: 370625
URL: https://svnweb.freebsd.org/changeset/ports/370625
QAT: https://qat.redports.org/buildarchive/r370625/

Log:
  devel/opengrok: Make the installed version runnable (and usable)
  
  PR:		194177
  Reported by:	shen.elf (gmail)
  Fixed by:	marino and shen.elf

Modified:
  head/devel/opengrok/Makefile
  head/devel/opengrok/files/opengrok.in
  head/devel/opengrok/pkg-plist

Modified: head/devel/opengrok/Makefile
==============================================================================
--- head/devel/opengrok/Makefile	Sat Oct 11 06:54:58 2014	(r370624)
+++ head/devel/opengrok/Makefile	Sat Oct 11 07:28:56 2014	(r370625)
@@ -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.t
 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 \

Modified: head/devel/opengrok/files/opengrok.in
==============================================================================
--- head/devel/opengrok/files/opengrok.in	Sat Oct 11 06:54:58 2014	(r370624)
+++ head/devel/opengrok/files/opengrok.in	Sat Oct 11 07:28:56 2014	(r370625)
@@ -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 $*

Modified: head/devel/opengrok/pkg-plist
==============================================================================
--- head/devel/opengrok/pkg-plist	Sat Oct 11 06:54:58 2014	(r370624)
+++ head/devel/opengrok/pkg-plist	Sat Oct 11 07:28:56 2014	(r370625)
@@ -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
- at dirrmtry %%T%%/webapps/opengrok/META-INF
- at dirrmtry %%T%%/webapps/opengrok/WEB-INF/lib
- at dirrmtry %%T%%/webapps/opengrok/WEB-INF
- at dirrmtry %%T%%/webapps/opengrok/default/img
- at dirrmtry %%T%%/webapps/opengrok/default
- at dirrmtry %%T%%/webapps/opengrok/offwhite/img
- at dirrmtry %%T%%/webapps/opengrok/offwhite
- at dirrmtry %%T%%/webapps/opengrok/polished/img
- at dirrmtry %%T%%/webapps/opengrok/polished
- at dirrmtry %%T%%/webapps/opengrok
- at dirrmtry %%DATADIR%%/lib
- at dirrmtry %%DATADIR%%