From owner-svn-ports-all@FreeBSD.ORG Sat Oct 11 07:28:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CCF82A1; Sat, 11 Oct 2014 07:28:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D5DB1AA; Sat, 11 Oct 2014 07:28:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B7SwD8097630; Sat, 11 Oct 2014 07:28:58 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B7SvRN097627; Sat, 11 Oct 2014 07:28:57 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410110728.s9B7SvRN097627@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 11 Oct 2014 07:28:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370625 - in head/devel/opengrok: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Oct 2014 07:28:58 -0000 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 -@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%%