From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 13 09:30:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA1EB106566C for ; Mon, 13 Aug 2012 09:30:02 +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 C06E78FC1C for ; Mon, 13 Aug 2012 09:30:02 +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 q7D9U2n4092928 for ; Mon, 13 Aug 2012 09:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7D9U2YI092925; Mon, 13 Aug 2012 09:30:02 GMT (envelope-from gnats) Resent-Date: Mon, 13 Aug 2012 09:30:02 GMT Resent-Message-Id: <201208130930.q7D9U2YI092925@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, Yuri Pankov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9E41106564A; Mon, 13 Aug 2012 09:26:00 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from polaris.xvoid.org (polaris.xvoid.org [IPv6:2001:470:28:4ba:20c:29ff:fe11:9beb]) by mx1.freebsd.org (Postfix) with ESMTP id 210AF8FC0A; Mon, 13 Aug 2012 09:25:59 +0000 (UTC) Received: from phoenix.xvoid.org (phoenix.xvoid.org [IPv6:2001:470:28:4ba:20c:29ff:fea2:c22e]) by polaris.xvoid.org (8.14.5/8.14.5) with ESMTP id q7D9Pw0Z031601; Mon, 13 Aug 2012 13:25:58 +0400 (MSK) (envelope-from yuri.pankov@gmail.com) Received: from phoenix.xvoid.org (localhost [IPv6:::1]) by phoenix.xvoid.org (8.14.5/8.14.5) with ESMTP id q7D9Pw2m056825; Mon, 13 Aug 2012 13:25:58 +0400 (MSK) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by phoenix.xvoid.org (8.14.5/8.14.5/Submit) id q7D9PvBx056824; Mon, 13 Aug 2012 13:25:57 +0400 (MSK) (envelope-from yuri.pankov@gmail.com) Message-Id: <201208130925.q7D9PvBx056824@phoenix.xvoid.org> Date: Mon, 13 Aug 2012 13:25:57 +0400 (MSK) From: Yuri Pankov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jgh@FreeBSD.org Subject: ports/170597: [PATCH] devel/opengrok: Allow customization of application server install location 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, 13 Aug 2012 09:30:03 -0000 >Number: 170597 >Category: ports >Synopsis: [PATCH] devel/opengrok: Allow customization of application server install location >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 Aug 13 09:30:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD phoenix.xvoid.org 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r239046: Sun Aug 5 10:58:12 >Description: Allow customization of install location of the application server using WEBAPP_HOME variable. Port maintainer (jgh@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS) >How-To-Repeat: >Fix: --- opengrok-0.11.1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/opengrok/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- Makefile 25 Jun 2012 23:09:07 -0000 1.9 +++ Makefile 13 Aug 2012 09:23:44 -0000 @@ -26,7 +26,7 @@ SUB_FILES= opengrok SUB_LIST+= LIBFILES="${LIBFILES:S,^,${DATADIR}/,}" \ JARFILE="${JARFILE}" -PLIST_SUB= T=${WEBAPP_DIRS:S|^${LOCALBASE}/||} \ +PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ CONF_EXT=${CONF_EXT} CONF_EXT= sample @@ -46,23 +46,25 @@ swing-layout-0.9.jar .if ${PORT_OPTIONS:MTOMCAT6} -WEBAPP_DIRS= apache-tomcat-6.0 -BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 -RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-6.0 +BUILD_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +RUN_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 .endif .if ${PORT_OPTIONS:MTOMCAT5} -WEBAPP_DIRS= tomcat5.5 -BUILD_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 -RUN_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +WEBAPP_HOME?= ${LOCALBASE}/tomcat5.5 +BUILD_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 .endif .if ${PORT_OPTIONS:MRESIN3} -WEBAPP_DIRS= resin3 -BUILD_DEPENDS+= ${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3 -RUN_DEPENDS+= ${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3 +WEBAPP_HOME?= ${LOCALBASE}/resin3 +BUILD_DEPENDS+= ${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3 +RUN_DEPENDS+= ${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3 .endif +WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps + pre-everything:: .if ${PREFIX}!=${LOCALBASE} @${ECHO_MSG} "Warning: you changed prefix to ${PREFIX}" @@ -75,17 +77,17 @@ @${TAR} xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/${PORTNAME} do-install: - ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME} + ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} @${MV} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} - @cd ${WRKSRC}/lib/${PORTNAME} && ${COPYTREE_SHARE} \* ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME} + @cd ${WRKSRC}/lib/${PORTNAME} && ${COPYTREE_SHARE} \* ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} - @if [ ! -e "${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml" ]; then \ - ${ECHO_MSG} " Installing local configuration file: ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml"; \ - ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml; \ + @if [ ! -e "${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml" ]; then \ + ${ECHO_MSG} " Installing local configuration file: ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml"; \ + ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml; \ else \ - ${ECHO_MSG} " Preserving local configuration file: ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml"; \ + ${ECHO_MSG} " Preserving local configuration file: ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml"; \ fi; - ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF + ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF ${MKDIR} ${DATADIR}/lib ${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} ${DATADIR}/lib/ --- opengrok-0.11.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: