From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 19 21:00:25 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BE57106564A for ; Mon, 19 Dec 2011 21:00:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4FC158FC17 for ; Mon, 19 Dec 2011 21:00:25 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pBJL0PXm057225 for ; Mon, 19 Dec 2011 21:00:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pBJL0Pcm057224; Mon, 19 Dec 2011 21:00:25 GMT (envelope-from gnats) Resent-Date: Mon, 19 Dec 2011 21:00:25 GMT Resent-Message-Id: <201112192100.pBJL0Pcm057224@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Evan Sarmiento Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE594106566C for ; Mon, 19 Dec 2011 20:56:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id CE0568FC1F for ; Mon, 19 Dec 2011 20:56:41 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pBJKufbL056125 for ; Mon, 19 Dec 2011 20:56:41 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pBJKuf0J056124; Mon, 19 Dec 2011 20:56:41 GMT (envelope-from nobody) Message-Id: <201112192056.pBJKuf0J056124@red.freebsd.org> Date: Mon, 19 Dec 2011 20:56:41 GMT From: Evan Sarmiento To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163459: Upgrade devel/opengrok to 0.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2011 21:00:25 -0000 >Number: 163459 >Category: ports >Synopsis: Upgrade devel/opengrok to 0.10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 19 21:00:24 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Evan Sarmiento >Release: 8.2 >Organization: Wayfair >Environment: FreeBSD devwebbsd01.csnzoo.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Wed Apr 6 18:18:38 EDT 2011 root@:/usr/obj/usr/src/sys/CSNXENHVM amd64 >Description: Upgrade devel/opengrok to 0.10 - Fixes port such that packages (.tbz) can be built- - Installs to apache-tomcat-6||55||resin/webapps/${PORTAME}.war instead of source.war - Fixes a few portlint issues >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN opengrok0.9/Makefile opengrok/Makefile --- opengrok0.9/Makefile 2011-11-14 13:59:52.000000000 -0500 +++ opengrok/Makefile 2011-12-19 15:34:03.000000000 -0500 @@ -6,16 +6,16 @@ # PORTNAME= opengrok -PORTVERSION= 0.9 +PORTVERSION= 0.10 CATEGORIES= devel java MASTER_SITES= http://hub.opensolaris.org/bin/download/Project+opengrok/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Fast and powerful code search and cross-reference egine -LICENSE= CDDL +RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags -RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags +LICENSE= CDDL USE_JAVA= yes JAVA_VERSION= 1.6+ @@ -33,26 +33,28 @@ JARFILE= ${DATADIR}/opengrok.jar WARFILE= source.war DOCS= CHANGES.txt EXAMPLE.txt LICENSE.txt -LIBFILES= ant.jar bcel-5.2.jar jakarta-oro-2.0.8.jar \ - jmxremote_optional.jar lucene-core-3.0.1.jar \ - lucene-spellchecker-3.0.1.jar org.apache.commons.jrcs.diff.jar \ - org.apache.commons.jrcs.rcs.jar org.apache.commons.jrcs.rcs.jar \ +LIBFILES= ant.jar bcel-5.2.jar \ + lucene-core-3.0.2.jar jrcs.jar \ + lucene-spellchecker-3.0.2.jar \ swing-layout-0.9.jar WEBAPP_DIRS= #empty .if defined(WITH_TOMCAT55) WEBAPP_DIRS+= tomcat5.5 RUN_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +PLIST_FILES+= ${WEBAPP_DIRS[@]: -1}/webapps/${PORTNAME}.war .endif .if defined(WITH_TOMCAT6) WEBAPP_DIRS+= apache-tomcat-6.0 RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +PLIST_FILES+= ${WEBAPP_DIRS[@]: -1}/webapps/${PORTNAME}.war .endif .if defined(WITH_RESIN3) WEBAPP_DIRS+= resin3 RUN_DEPENDS+= ${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3 +PLIST_FILES== ${WEBAPP_DIRS[@]: -1}/webapps/${PORTNAME}.war .endif do-install: @@ -62,10 +64,10 @@ @${ECHO_CMD} "application server in different prefix" .endif .for DIR in ${WEBAPP_DIRS} - @${ECHO_CMD} "${DIR}/webapps/${WARFILE}" >> ${TMPPLIST} + @${ECHO_CMD} "${DIR}/webapps/${PORTNAME}.war" >> ${TMPPLIST} ${MKDIR} ${PREFIX}/${DIR}/webapps - @${ECHO_CMD} "@unexec rmdir %D/${DIR}/webapps 2>/dev/null || true" >> ${TMPPLIST} - ${INSTALL_DATA} ${WRKSRC}/lib/${WARFILE} ${PREFIX}/${DIR}/webapps + @${ECHO_CMD} "@unexec ${RMDIR} %D/${DIR}/webapps 2>/dev/null || true" >> ${TMPPLIST} + ${INSTALL_DATA} ${WRKSRC}/lib/${WARFILE} ${PREFIX}/${DIR}/webapps/${PORTNAME}.war .endfor ${MKDIR} ${DATADIR}/lib ${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} ${DATADIR}/lib/ diff -ruN opengrok0.9/distinfo opengrok/distinfo --- opengrok0.9/distinfo 2011-11-14 13:59:52.000000000 -0500 +++ opengrok/distinfo 2011-12-19 15:34:03.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (opengrok-0.9.tar.gz) = 82e9d6f321ae6ba4225920a82d343ebf1d9ba434a15985292ed93223b348ccf9 -SIZE (opengrok-0.9.tar.gz) = 6979566 +SHA256 (opengrok-0.10.tar.gz) = 2538cd724782859b022c5984dd8100fec331a3ad464a40f4b4bc8c83f8673666 +SIZE (opengrok-0.10.tar.gz) = 6553370 diff -ruN opengrok0.9/pkg-plist opengrok/pkg-plist --- opengrok0.9/pkg-plist 2011-11-14 13:59:52.000000000 -0500 +++ opengrok/pkg-plist 2011-12-19 15:46:02.000000000 -0500 @@ -4,14 +4,14 @@ %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt %%DATADIR%%/lib/ant.jar %%DATADIR%%/lib/bcel-5.2.jar -%%DATADIR%%/lib/jakarta-oro-2.0.8.jar -%%DATADIR%%/lib/jmxremote_optional.jar -%%DATADIR%%/lib/lucene-core-3.0.1.jar -%%DATADIR%%/lib/lucene-spellchecker-3.0.1.jar -%%DATADIR%%/opengrok.jar -%%DATADIR%%/lib/org.apache.commons.jrcs.diff.jar -%%DATADIR%%/lib/org.apache.commons.jrcs.rcs.jar +%%DATADIR%%/lib/jrcs.jar +%%DATADIR%%/lib/lucene-core-3.0.2.jar +%%DATADIR%%/lib/lucene-spellchecker-3.0.2.jar %%DATADIR%%/lib/swing-layout-0.9.jar +%%DATADIR%%/opengrok.jar +share/licenses/opengrok-0.10/catalog.mk +share/licenses/opengrok-0.10/LICENSE +share/licenses/opengrok-0.10/CDDL @dirrm %%DATADIR%%/lib @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: